Use wait-for-it script to determine whether database container is up

range-of-motion · Dec 3, 2023 · b20eb46 · b20eb46
1 parent c0b6641
commit b20eb46
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -14,18 +14,10 @@ services:
     ports:
       - "33061:3306"
     command: --default-authentication-plugin=mysql_native_password
-    healthcheck:
-      test: ["CMD", "mysql", "-ubudget", "-ptest", "--execute", "SHOW DATABASES;"]
-      interval: 3s
-      timeout: 3s
-      retries: 5
 
   app:
     build:
       context: .
       dockerfile: docker/Dockerfile
-    depends_on:
-      database:
-        condition: service_healthy
     ports:
       - "8080:80"
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
@@ -8,7 +8,10 @@ fi
 
 php artisan config:cache
 
-php artisan migrate --force
+databaseHost=$(awk -F= '$1 == "DB_HOST" {print $2}' .env)
+databasePort=$(awk -F= '$1 == "DB_PORT" {print $2}' .env)
+
+./docker/wait-for-it.sh $databaseHost:$databasePort -t 90 -- php artisan migrate --force
 
 supervisord -n -c docker/supervisord.conf
 

diff --git a/wait-for-it.sh → docker/wait-for-it.sh b/wait-for-it.sh → docker/wait-for-it.sh