diff --git a/docker-compose.yml b/docker-compose.yml index 54dea3b..e4e4086 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,7 @@ services: MYSQL_USER: ${DB_USERNAME} MYSQL_PASSWORD: ${DB_PASSWORD} healthcheck: - test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + test: ["CMD-SHELL", "mysqladmin ping -h localhost --ssl=0 -u root -p\"$$MYSQL_ROOT_PASSWORD\""] interval: 10s timeout: 5s retries: 10 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 3768c3a..42649bb 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -78,9 +78,5 @@ php artisan view:cache # 6. Storage link php artisan storage:link 2>/dev/null || true -# 7. Switch to app user and start PHP-FPM -if [ "$(id -u)" = "0" ]; then - exec su-exec app php-fpm -else - exec php-fpm -fi +# 7. Start PHP-FPM +exec php-fpm