[server] Start dozmod-server Docker container after database Docker container is ready

1 files changed, 25 insertions, 23 deletions

diff --git a/dozentenmodulserver/docker-compose.yml b/dozentenmodulserver/docker-compose.yml
index c125e738..eae03f06 100644
--- a/dozentenmodulserver/docker-compose.yml
+++ b/dozentenmodulserver/docker-compose.yml
@@ -8,54 +8,56 @@ services:
             context: .
             dockerfile: pkg/docker/dozmod-server_dockerfile
             args:
-                DOZMOD_MASTER_SERVER: bwlp-masterserver.ruf.uni-freiburg.de
                 DOZMOD_SERVER_FILE: target/dozmod-server-1.0-SNAPSHOT-jar-with-dependencies.jar
-                DOZMOD_CONFIG_FILE: setup/config.properties
-                DOZMOD_VSTORE_PATH: /mnt/bwLehrpool
-                DOZMOD_DATABASE_NAME: sat
-                DOZMOD_DATABASE_HOST: 192.168.200.20
-                DOZMOD_DATABASE_USER: root
-                DOZMOD_DATABASE_PASSWORD: dozmod
+                DOZMOD_CONFIG_FILE: setup/config.properties.tmpl
+                DOZMOD_VSTORE_PATH: ${DOZMOD_SERVER_STORAGE}
+        environment:
+            DOZMOD_MASTER_SERVER: ${DOZMOD_SERVER_MASTER}
+            DOZMOD_DATABASE_NAME: ${DOZMOD_DATABASE_NAME}
+            DOZMOD_DATABASE_HOST: ${DOZMOD_DATABASE_IPV4}
+            DOZMOD_DATABASE_USER: ${DOZMOD_DATABASE_USER}
+            DOZMOD_DATABASE_PASSWORD: ${DOZMOD_DATABASE_PASSWORD}
+            DOZMOD_VSTORE_PATH: ${DOZMOD_SERVER_STORAGE}
         volumes:
-            - dozmod-server:/mnt/bwLehrpool
+            - dozmod-server:${DOZMOD_SERVER_STORAGE}
         depends_on:
             - dozmod-database
         networks:
             dozmod:
-                ipv4_address: 192.168.200.10
-                ipv6_address: fd03:4b1d:5707:c8::a
+                ipv4_address: ${DOZMOD_SERVER_IPV4}
+                ipv6_address: ${DOZMOD_SERVER_IPV6}
     dozmod-database:
         container_name: dozmod-database
         image: mariadb:latest
         restart: on-failure
         hostname: database.dozmod
         environment:
-            MYSQL_DATABASE: sat
-            MYSQL_ROOT_PASSWORD: dozmod
+            MYSQL_DATABASE: ${DOZMOD_DATABASE_NAME}
+            MYSQL_ROOT_PASSWORD: ${DOZMOD_DATABASE_PASSWORD}
         volumes:
             - dozmod-database:/var/lib/mysql
-            - ./setup:/docker-entrypoint-initdb.d
+            - ./${DOZMOD_DATABASE_DATASET_PATH}:/docker-entrypoint-initdb.d
         networks:
             dozmod:
-                ipv4_address: 192.168.200.20
-                ipv6_address: fd03:4b1d:5707:c8::14
+                ipv4_address: ${DOZMOD_DATABASE_IPV4}
+                ipv6_address: ${DOZMOD_DATABASE_IPV6}
     dozmod-phpmyadmin:
         container_name: dozmod-phpmyadmin
         image: phpmyadmin:latest
         hostname: phpmyadmin.dozmod
         restart: on-failure
         environment:
-            PMA_HOST: 192.168.200.20
+            PMA_HOST: ${DOZMOD_DATABASE_IPV4}
             PMA_VERBOSE: database.dozmod
-            MYSQL_ROOT_PASSWORD: dozmod
+            MYSQL_ROOT_PASSWORD: ${DOZMOD_DATABASE_PASSWORD}
         depends_on:
             - dozmod-database
         ports:
             - 8080:80
         networks:
             dozmod:
-                ipv4_address: 192.168.200.30
-                ipv6_address: fd03:4b1d:5707:c8::1e
+                ipv4_address: ${DOZMOD_PHPMYADMIN_IPV4}
+                ipv6_address: ${DOZMOD_PHPMYADMIN_IPV6}
 volumes:
     dozmod-server:
         name: dozmod-server
@@ -69,7 +71,7 @@ networks:
         ipam:
             driver: default
             config:
-                - subnet: 192.168.200.0/24
-                  gateway: 192.168.200.1
-                - subnet: fd03:4b1d:5707:c8::/64
-                  gateway: fd03:4b1d:5707:c8::1
+                - subnet: ${DOZMOD_NETWORK_IPV4}
+                  gateway: ${DOZMOD_NETWORK_IPV4_GATEWAY}
+                - subnet: ${DOZMOD_NETWORK_IPV6}
+                  gateway: ${DOZMOD_NETWORK_IPV6_GATEWAY}