Forráskód Böngészése

Fix for AIO docker

svalavuo 4 órája
szülő
commit
f89b2a992f
3 módosított fájl, 5 hozzáadás és 8 törlés
  1. 3 3
      .env.with-services
  2. 2 0
      backend/init-database.php
  3. 0 5
      docker-compose-with-services.yml

+ 3 - 3
.env.with-services

@@ -36,6 +36,6 @@ MARIADB_PORT=3306
 REDIS_PORT=6379
 
 # Volumes in local filesystem
-APP_LOCATION=/some/directory
-DB_LOCATION=/some/directory
-REDIS_LOCATION=/some/directory
+APP_LOCATION=./
+DB_LOCATION=./
+REDIS_LOCATION=./

+ 2 - 0
backend/init-database.php

@@ -35,6 +35,8 @@ function loadEnv($file) {
 
 // Load environment from .env file
 loadEnv('.env');
+// Also try to load from .env.with-services for docker-compose-with-services
+loadEnv('.env.with-services');
 
 // Get database configuration
 $dbHost = getenv('DB_HOST') ?: 'localhost';

+ 0 - 5
docker-compose-with-services.yml

@@ -78,11 +78,6 @@ services:
       retries: 3
       start_period: 40s
 
-volumes:
-  mariadb_data:
-    driver: local
-  redis_data:
-    driver: local
 
 networks:
   default: