From 94c8fb7326d6c418b3cd5433ac0b310e1ae73862 Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Sun, 20 Nov 2022 21:55:25 +0100
Subject: [PATCH 1/2] test dockerfile

---
 docker-compose.test.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 56e1d561..f8c064d0 100644
--- a/docker-compose.test.yml
+++ b/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
-     - DEBUG
-     - SECRET_KEY
-     - MYSQL_USER
-     - MYSQL_PASSWORD
-     - MYSQL_PORT
+     - HOST_NAME: test.fet.at
+     - DEBUG: "False"
+     - SECRET_KEY: "sadfreigjopi4qgjpjrp"
+     - MYSQL_USER: "user"
+     - MYSQL_PASSWORD: "hgu"
+     - ETHERPAD_GROUP: "g.snlbqn7S6ksRbom3"
     depends_on:
     - mysql
     - etherpad

From f55b67e20f0e23641a1c01e0ffa69a8fae7728f5 Mon Sep 17 00:00:00 2001
From: andis <andis@fet.at>
Date: Sun, 20 Nov 2022 22:29:09 +0100
Subject: [PATCH 2/2] fix mapping for docker test

---
 docker-compose.test.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index f8c064d0..87a0e52f 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -55,12 +55,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
     - etherpad
@@ -73,4 +73,4 @@ volumes:
   ep-mysql-volume:
     driver: local
   mysql-volume:
-    driver: local
\ No newline at end of file
+    driver: local