From 9ebf2ba0a5d00a46527c73a6b2fa011fc0d87bfa Mon Sep 17 00:00:00 2001 From: andis Date: Sun, 10 Jan 2021 07:13:28 +0000 Subject: [PATCH] build dev 2020 DockerImages --- deployment/dev_nginx/Dockerfile | 2 + deployment/dev_nginx/build_and_push | 3 ++ deployment/dev_nginx/nginxdev.conf | 67 +++++++++++++++++++++++++++ deployment/dev_theia/Dockerfile | 5 ++ deployment/dev_theia/build_and_push | 3 ++ deployment/dev_theia/requirements.txt | 16 +++++++ 6 files changed, 96 insertions(+) create mode 100644 deployment/dev_nginx/Dockerfile create mode 100755 deployment/dev_nginx/build_and_push create mode 100644 deployment/dev_nginx/nginxdev.conf create mode 100644 deployment/dev_theia/Dockerfile create mode 100755 deployment/dev_theia/build_and_push create mode 100644 deployment/dev_theia/requirements.txt diff --git a/deployment/dev_nginx/Dockerfile b/deployment/dev_nginx/Dockerfile new file mode 100644 index 00000000..a157b5c9 --- /dev/null +++ b/deployment/dev_nginx/Dockerfile @@ -0,0 +1,2 @@ +from nginx:alpine +copy nginxdev.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/deployment/dev_nginx/build_and_push b/deployment/dev_nginx/build_and_push new file mode 100755 index 00000000..fff38493 --- /dev/null +++ b/deployment/dev_nginx/build_and_push @@ -0,0 +1,3 @@ +cp ../nginxdev.conf . +docker build . -t docker.triton2.fet.at/nginxdev-fet2020:latest +docker image push docker.triton2.fet.at/nginxdev-fet2020:latest \ No newline at end of file diff --git a/deployment/dev_nginx/nginxdev.conf b/deployment/dev_nginx/nginxdev.conf new file mode 100644 index 00000000..35267064 --- /dev/null +++ b/deployment/dev_nginx/nginxdev.conf @@ -0,0 +1,67 @@ +server { + listen 8080; + error_log /var/log/nginx/error.log notice; + rewrite_log on; + resolver 127.0.0.11 valid=30s; + set $theia theia; + set $flaskfetfotos "flaskfetfotos:8080"; + set $etherpad "etherpad:9001"; + location /fotos { + proxy_ssl_server_name on; + proxy_ssl_verify off; + + proxy_pass http://$flaskfetfotos; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + # proxy_set_header REMOTE-USER $http_REMOTE_USER; +# proxy_set_header X-Forwarded-User $http_REMOTE_USER; +# proxy_set_header x-forwarded-user $http_REMOTE_USER; + proxy_set_header Connection "upgrade"; + + + } + + location /etherpad { + + rewrite /etherpad/(.*) /$1 break; + rewrite ^/etherpad$ /etherpad/ permanent; + + proxy_pass http://$etherpad; + proxy_redirect / /etherpad/; + proxy_set_header Host $host; + proxy_buffering off; + + } + location /dev { + rewrite_log on; + rewrite /dev/(.*) /$1 break; + rewrite ^/dev$ /dev/ permanent; + proxy_set_header Host $host; + proxy_set_header Proxy ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarde-Proto $scheme; + + + proxy_buffering off; + proxy_pass http://$theia:3000; + } + + location / { + proxy_set_header Host $host; + proxy_set_header Proxy ""; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarde-Proto $scheme; + + + proxy_buffering off; + + proxy_pass http://$theia:8000; + + } +} diff --git a/deployment/dev_theia/Dockerfile b/deployment/dev_theia/Dockerfile new file mode 100644 index 00000000..fa58a392 --- /dev/null +++ b/deployment/dev_theia/Dockerfile @@ -0,0 +1,5 @@ +from theiaide/theia-python:latest +run apt-get update && apt-get -y install libgs-dev +COPY ./requirements.txt . +run pip3 install --upgrade pip && pip3 install -r requirements.txt && pip3 install pytest pylint bandit flake8 black pytest-django six pytest-mock +ENTRYPOINT node /home/theia/src-gen/backend/main.js /home/project/.theia-workspace --hostname=0.0.0.0 \ No newline at end of file diff --git a/deployment/dev_theia/build_and_push b/deployment/dev_theia/build_and_push new file mode 100755 index 00000000..e79a0260 --- /dev/null +++ b/deployment/dev_theia/build_and_push @@ -0,0 +1,3 @@ +cp ../../fet2020/requirements.txt . +docker build . -t docker.triton2.fet.at/theia-fet2020:latest +docker image push docker.triton2.fet.at/theia-fet2020:latest \ No newline at end of file diff --git a/deployment/dev_theia/requirements.txt b/deployment/dev_theia/requirements.txt new file mode 100644 index 00000000..c3e5fcb5 --- /dev/null +++ b/deployment/dev_theia/requirements.txt @@ -0,0 +1,16 @@ +django==3.1.4 +django-ckeditor==6.0.0 +django-crontab==0.7.1 +django-environ==0.4.5 +django-filter==2.4.0 +django-static-jquery-ui==1.12.1.1 +django-softhyphen==1.1.0 +django-taggit==1.3.0 +djangorestframework==3.12.2 +configparser==5.0.1 +docutils==0.16 +easy-thumbnails==2.7.1 +etherpad-lite==0.5 +ghostscript==0.6 +ldap3==2.8.1 +mysqlclient==2.0.1