Skip to content
Snippets Groups Projects
Commit 09cb7c2e authored by Chris Hines's avatar Chris Hines
Browse files

Merge branch 'dev' into 'test'

Dev

See merge request !91
parents 9b85d3e8 d70a2002
No related branches found
No related tags found
2 merge requests!93Test,!91Dev
Pipeline #67001 passed
......@@ -39,7 +39,7 @@ deploy_test:
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
- docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
- docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
- docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
- docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always -v /home/ubuntu/telegraf.conf:/etc/telegraf/telegraf.conf:ro -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
dependencies:
- build
......@@ -61,7 +61,7 @@ deploy_dev:
- docker ps -a -q | xargs -I{} docker rm {} || echo "No containers to remove"
- docker images -q | xargs -I{} docker rmi {} || echo "No images to remove"
- docker pull l1ll1/strudel2_backend:$CI_COMMIT_BRANCH
- docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
- docker run --mount type=bind,source=/messages,target=/messages --mount type=bind,source=/var/log/strudel2,target=/var/log/strudel2 --restart=always -v /home/ubuntu/telegraf.conf:/etc/telegraf/telegraf.conf:ro -d -p 8080:8080 -p 8090:8090 --name strudel2_backend l1ll1/strudel2_backend:$CI_COMMIT_BRANCH || echo "Unable to start image ... possibly the old wsgi process is still running?"
dependencies:
- build
......
FROM ubuntu
WORKDIR /opt/strudel2/src
COPY . /opt/strudel2/src
RUN apt update && apt install -y python3 gcc python3-pip openssh-client
RUN apt update && apt install -y python3 gcc python3-pip openssh-client telegraf
RUN pip3 install -r requirements.txt && pip install .
RUN mkdir -p /var/www/.ssh && chown www-data:www-data /var/www/.ssh && chmod 700 /var/www/.ssh
EXPOSE 8080 8090
......
......@@ -7,6 +7,8 @@ uwsgi \
--protocol=http \
--uid=www-data \
--gid=www-data \
--stats /tmp/statsock \
-w tes.tes_wsgi &
telegraf &
twsproxy 8090
......@@ -42,7 +42,7 @@ class Ssh:
"""
Ssh class can execute or create tunnelstat
"""
TIMEOUT=60
TIMEOUT=30
SSHOPTS = [ '-o', 'StrictHostKeyChecking=no',
'-o', 'UserKnownHostsFile=/dev/null',
'-o', 'IdentityFile=/dev/null',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment