Some more changes for Docker

compose.yaml

@@ -15,6 +15,14 @@ services:
     networks:
       - wkvs
 
+  env-init:
+    build: ./config/apache
+    container_name: wkvs-env-init
+    volumes:
+      - .:/var/wkvs
+    working_dir: /var/wkvs
+    command: php setup/init-env.php
+
   composer-init:
     image: composer:latest
     container_name: wkvs-composer-init
@@ -22,6 +30,9 @@ services:
       - .:/app
     working_dir: /app/composer
     command: composer install --no-interaction --prefer-dist
+    depends_on:
+      env-init:
+        condition: service_completed_successfully
 
   apache:
     build: ./config/apache
@@ -42,7 +53,8 @@ services:
     container_name: wkvs-mariadb
     restart: unless-stopped
     env_file:
-      - ./config/.env.db
+      - path: ./config/.env.db
+        required: false
     volumes:
       - db_data:/var/lib/mysql
     healthcheck:
@@ -50,6 +62,9 @@ services:
       interval: 5s
       timeout: 5s
       retries: 5
+    depends_on:
+      env-init:
+        condition: service_completed_successfully
     networks:
       - wkvs
 
@@ -62,6 +77,8 @@ services:
     depends_on:
       mariadb:
         condition: service_healthy
+      env-init:
+        condition: service_completed_successfully
     networks:
       - wkvs
     command: php setup/database/init-db.php
@@ -71,8 +88,12 @@ services:
     container_name: wkvs-redis
     restart: unless-stopped
     env_file:
-      - ./config/.env.redis
+      - path: ./config/.env.redis
+        required: false
     command: ["sh", "-c", "exec redis-server --requirepass \"$REDDIS_PASSWORD\""]
+    depends_on:
+      env-init:
+        condition: service_completed_successfully
     networks:
       - wkvs
 
@@ -84,12 +105,16 @@ services:
       - .:/var/wkvs
     working_dir: /var/wkvs/websocket
     env_file:
-      - ./config/.env.redis
+      - path: ./config/.env.redis
+        required: false
     environment:
       - REDDIS_HOST=redis
     command: sh -c "npm install && npm install -g pm2 && pm2-runtime start index.js --max-memory-restart 1G --node-args=\"--max-old-space-size=1024\" --name=\"WebSocket WKVS\""
     depends_on:
-      - redis
+      redis:
+        condition: service_started
+      env-init:
+        condition: service_completed_successfully
     networks:
       - wkvs