update on docker compose file to fix database issues

Author: sudo-which-qp

docker-compose.yaml

@@ -5,8 +5,6 @@ networks:
 
 services:
   app:
-    env_file:
-      - .env
     build:
       context: .
       dockerfile: Dockerfile
@@ -15,18 +13,19 @@ services:
       - 8000:8000
     volumes:
       - .:/app
-      # Use a named volume for vendor directory to preserve packages
       - vendor:/app/vendor
     depends_on:
       db:
         condition: service_healthy
+    env_file:
+      - .env
     environment:
       - DB_HOST=db
       - DB_CONNECTION=mysql
       - DB_PORT=3306
       - DB_DATABASE=test-db
-      - DB_USERNAME=${DB_USERNAME:-root}
-      - DB_PASSWORD=${DB_PASSWORD:-secret}
+      - DB_USERNAME=${DB_USERNAME}
+      - DB_PASSWORD=${DB_PASSWORD}
     networks:
       - application
 
@@ -36,8 +35,10 @@ services:
       - "3307:3306"
     volumes:
       - ./data:/var/lib/mysql
+    env_file:
+      - .env
     environment:
-      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD:-secret}
+      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
       - MYSQL_DATABASE=test-db
     networks:
       - application
@@ -52,7 +53,7 @@ services:
           "localhost",
           "-u",
           "root",
-          "-p${DB_PASSWORD:-secret}",
+          "-p${DB_PASSWORD}",
         ]
       interval: 5s
       timeout: 5s
@@ -63,10 +64,12 @@ services:
     container_name: phpmyadmin
     ports:
       - "8080:80"
+    env_file:
+      - .env
     environment:
       - PMA_HOST=db
-      - PMA_USER=${DB_USERNAME:-root}
-      - PMA_PASSWORD=${DB_PASSWORD:-secret}
+      - PMA_USER=${DB_USERNAME}
+      - PMA_PASSWORD=${DB_PASSWORD}
     depends_on:
       - db
     networks:

docker-entrypoint.sh

@@ -16,16 +16,16 @@ else
   composer install --no-interaction --no-progress
 fi
 
-# Generate application key if APP_KEY is empty or not set correctly
-if ! grep -q "APP_KEY=.*[A-Za-z0-9+/]" .env || grep -q "APP_KEY=$" .env; then
+# Generate application key if not set
+if grep -q "APP_KEY=base64:" .env && ! grep -q "APP_KEY=base64:.*[^=]" .env; then
   echo "Generating Laravel application key..."
   php artisan key:generate --no-interaction
 fi
 
 # Run migrations if needed
-if [ "${RUN_MIGRATIONS:-true}" = "true" ]; then
+if [ "${RUN_MIGRATIONS:-false}" = "true" ]; then
   echo "Running database migrations..."
-  php artisan migrate
+  php artisan migrate --force
 fi
 
 # Cache configurations for production