Stage after merging with project files

docker-compose.yml

@@ -7,28 +7,38 @@ services:
       - .env
     working_dir: /workspace
     command: >-
-      sh -lc "if [ ! -d node_modules ]; then npm install --no-fund --no-audit; fi && npm run dev"
+      sh -lc "npm install --no-fund --no-audit && npm run dev"
     volumes:
       - .:/workspace:cached
     ports:
-      - "${APP_PORT:-3000}:${APP_PORT:-3000}"
+      - "${PORT:-3000}:${PORT:-3000}"
     depends_on:
-      - db
+      db:
+        condition: service_healthy
+    restart: unless-stopped
 
   db:
     image: bitnami/mariadb:latest
     env_file:
       - .env
     environment:
-      MARIADB_DATABASE: ${DB_NAME:-app_db}
-      MARIADB_USER: ${DB_USER:-app_user}
-      MARIADB_PASSWORD: ${DB_PASSWORD:-app_password}
+      MARIADB_DATABASE: ${DB_NAME:-check_list}
+      MARIADB_USER: ${DB_USER:-check_list_user}
+      MARIADB_PASSWORD: ${DB_PASSWORD:-check_list_password}
       MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD:-root_password}
     ports:
       - "${DB_PORT:-3306}:3306"
     volumes:
       - mariadb_data:/bitnami/mariadb
-      - ./docker/mariadb/init:/docker-entrypoint-initdb.d:ro
+      - ./sql:/docker-entrypoint-initdb.d:ro
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - mariadb-admin ping -h 127.0.0.1 -uroot -p$$MARIADB_ROOT_PASSWORD --silent
+      interval: 5s
+      timeout: 5s
+      retries: 20
+      start_period: 15s
 
   phpmyadmin:
     image: phpmyadmin:5-apache
@@ -37,8 +47,8 @@ services:
     environment:
       PMA_HOST: db
       PMA_PORT: 3306
-      PMA_USER: ${DB_USER:-app_user}
-      PMA_PASSWORD: ${DB_PASSWORD:-app_password}
+      PMA_USER: ${DB_USER:-check_list_user}
+      PMA_PASSWORD: ${DB_PASSWORD:-check_list_password}
     ports:
       - "${PHPMYADMIN_PORT:-8080}:80"