merge branch 'master'

docker-compose.test.yml

@@ -19,20 +19,20 @@ services:
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - mysql-volume:/var/lib/mysql
-      #- /root/2022_04_24/mysql:/docker-entrypoint-initdb.d/
+     - /srv/initdb/mysql:/docker-entrypoint-initdb.d/
   etherpadsql:
     image: mariadb
     container_name: test_mysql_etherpad
     environment:
       MYSQL_DATABASE: etherpaddb
       MYSQL_USER: user
-      MYSQL_PASSWORD: hgu
+      MYSQL_PASSWORD: "hgu"
       MYSQL_COLLATION: utf8_general_ci
       MYSQL_CHARSET: utf8
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     volumes:
      - ep-mysql-volume:/var/lib/mysql
-#     - /root/2022_04_24/etherpad:/docker-entrypoint-initdb.d/
+     - /srv/initdb/etherpad:/docker-entrypoint-initdb.d/
   etherpad:
     image: etherpad/etherpad
     container_name: test_etherpad
@@ -55,12 +55,12 @@ services:
     image: docker.fet.at/fet2020django
     container_name: test_fet2020
     environment:
-     - HOST_NAME
+     HOST_NAME: "test.fet.at"
-     - DEBUG
+     DEBUG: "False"
-     - SECRET_KEY
+     SECRET_KEY: "sadfreigjopi4qgjpjrp"
-     - MYSQL_USER
+     MYSQL_USER: "user"
-     - MYSQL_PASSWORD
+     MYSQL_PASSWORD: "hgu"
-     - MYSQL_PORT
+     ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
     depends_on:
     - mysql
     - etherpad
@@ -73,4 +73,4 @@ volumes:
   ep-mysql-volume:
     driver: local
   mysql-volume:
-    driver: local
+    driver: local