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

docker-compose.test.yml

@@ -3,6 +3,8 @@ services:
   mysql:
     image: mariadb
     container_name: test_mysql
+    ports:
+      - "3306:3306"
     environment:
       MYSQL_DATABASE: fet2020db
       MYSQL_USER: user
@@ -11,8 +13,8 @@ services:
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
-     - mysql-volume:/var/lib/mysql
-     - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
+      #- mysql-volume:/var/lib/mysql
+      - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
     healthcheck:
       test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
       timeout: 20s
@@ -28,8 +30,8 @@ services:
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
-     - ep-mysql-volume:/var/lib/mysql
-     - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/
+      #- ep-mysql-volume:/var/lib/mysql
+      - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/
   etherpad:
     image: etherpad/etherpad
     container_name: test_etherpad
@@ -57,12 +59,12 @@ services:
     image: docker.fet.at/fet2020django
     container_name: test_fet2020
     environment:
-     HOST_NAME: "test.fet.at"
-     DEBUG: "False"
-     SECRET_KEY: "sadfreigjopi4qgjpjrp"
-     MYSQL_USER: "user"
-     MYSQL_PASSWORD: "hgu"
-     ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
+      HOST_NAME: "test.fet.at"
+      DEBUG: "False"
+      SECRET_KEY: "sadfreigjopi4qgjpjrp"
+      MYSQL_USER: "user"
+      MYSQL_PASSWORD: "hgu"
+      ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
     depends_on:
       mysql:
         condition: service_healthy