Merge branch 'master' of https://git.fet.at/bofh/fet2020

docker-compose.yml

@@ -2,8 +2,6 @@ version: "3"
 services:
   flaskfetfotos:
     image: flask-fet-fotos
-    ports:
-     - "8080:8080"
     environment:
      FLASK_DEBUG: 1
      FLASK_APP: main.py
@@ -18,7 +16,7 @@ services:
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
     volumes:
-     - mysql-volume:/var/lib/mysql
+     - ../mysql_django:/var/lib/mysql
   etherpadsql:
     image: jbergstroem/mariadb-alpine
     environment:
@@ -29,7 +27,7 @@ services:
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
     volumes:
-     - ep-mysql-volume:/var/lib/mysql
+     - ../mysql_etherpad:/var/lib/mysql
   etherpad:
     image: etherpad/etherpad
     environment:
@@ -44,7 +42,8 @@ services:
   fet2020:
     image: fet2020django
     environment:
-      HOST_NAME: "uat1.2020.fet.at"
+      HOST_NAME: "2020.fet.at"
+      DEBUG: "FALSE"
     depends_on:
      - mysql
     ports: