fix master

Dockerfile

@@ -22,6 +22,8 @@ COPY --from=builder /opt/venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 #COPY ./fet2020 /app
+COPY ./fet2020 /app
+COPY ./assets /app/assets
 COPY ./deployment/nginx.conf /etc/nginx/conf.d/fet2020.conf
 
 #RUN python manage.py makemigrations && python manage.py makemigrations posts members

Jenkinsfile

@@ -0,0 +1,50 @@
+pipeline {
+    agent any
+    stages {
+    stage('Checkout'){
+        steps {
+        git credentialsId: '3e336704-7d58-4dcb-88b6-1ef7b5392576', url: 'https://git.fet.at/bofh/fet2020.git'
+        }
+        
+    }
+    
+    stage('build Test') {
+        steps{
+            script {
+        app = docker.build("django2020test", "-f Dockerfile .")
+            }
+        }
+    }
+    stage('Test Inside') {
+        steps{
+            script {
+                app.inside("-u root:root") {
+                              sh 'ls && cd fet2020 && ls && ./manage.py test'
+                }
+            }
+        }
+    }    
+    
+    stage('build') {
+        steps{
+            script {
+        app = docker.build("fet2020django", "-f Dockerfile.test .")
+            }
+        }
+    }    
+    stage('Deploy Image') {
+      steps{
+        script {
+          docker.withRegistry( 'https://docker.fet.at/', '3e336704-7d58-4dcb-88b6-1ef7b5392576') {
+            app.push("1.$BUILD_NUMBER")
+             app.push('latest')
+
+          }
+        }
+      }
+    }
+    
+    
+    
+    }
+}

deployment/nginx.conf

@@ -2,8 +2,9 @@ server {
     listen 8080;
     error_log /var/log/nginx/error.log notice;
     rewrite_log on;
-
+    resolver 127.0.0.1 valid=30s;
-    
+    set $flaskfetfotos flaskfetfotos:8080;
+    set $etherpad etherpad:9001;
     location /assets {
              alias /app/assets;
              try_files $uri =404;
@@ -17,8 +18,7 @@ server {
     location /fotos {
         proxy_ssl_server_name on;
         proxy_ssl_verify off;
-
+        proxy_pass http://$flaskfetfotos;
-        proxy_pass http://flaskfetfotos:8080;
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         #             proxy_set_header REMOTE-USER $http_REMOTE_USER;
@@ -31,7 +31,7 @@ server {
     location /etherpad {
         rewrite /etherpad/(.*) /$1 break;
         rewrite ^/etherpad$ /etherpad/ permanent;
-        proxy_pass http://etherpad:9001;
+        proxy_pass http://$etherpad;
         proxy_redirect / /etherpad/;
         proxy_set_header Host $host;
         proxy_buffering off;