From 8204465048654e79be4b9db50cf6945470584860 Mon Sep 17 00:00:00 2001 From: Benjamin Brummer Date: Thu, 28 Nov 2024 21:35:05 +0100 Subject: [PATCH] cleanup --- debian/docker-compose.yml | 13 ++----------- debian/php/php-fpm.conf | 1 - debian/scripts/init.sh | 9 ++++----- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml index e5b96c0..a8cab11 100644 --- a/debian/docker-compose.yml +++ b/debian/docker-compose.yml @@ -59,16 +59,7 @@ services: networks: - app-network healthcheck: - test: - [ - "CMD", - "mysqladmin", - "ping", - "-h", - "localhost", - "-u${MYSQL_USER}", - "-p${MYSQL_PASSWORD}", - ] + test: [ "CMD", "mysqladmin", "ping", "-h", "localhost", "-u${MYSQL_USER}", "-p${MYSQL_PASSWORD}" ] interval: 10s timeout: 5s retries: 5 @@ -82,7 +73,7 @@ services: networks: - app-network healthcheck: - test: ["CMD", "redis-cli", "ping"] + test: [ "CMD", "redis-cli", "ping" ] interval: 10s timeout: 5s retries: 5 diff --git a/debian/php/php-fpm.conf b/debian/php/php-fpm.conf index aa4e660..63bbada 100644 --- a/debian/php/php-fpm.conf +++ b/debian/php/php-fpm.conf @@ -1,2 +1 @@ -[www] pm.max_children = 10 diff --git a/debian/scripts/init.sh b/debian/scripts/init.sh index 77a37bf..d0e6da1 100755 --- a/debian/scripts/init.sh +++ b/debian/scripts/init.sh @@ -1,10 +1,10 @@ #!/bin/sh set -e - in_log() { - local type="$1"; shift - printf '%s [%s] [Entrypoint]: %s\n' "$(date -u '+%Y-%m-%dT%H:%M:%SZ')" "$type" "$*" + local type="$1" + shift + printf '%s [%s] [Entrypoint]: %s\n' "$(date -u '+%Y-%m-%dT%H:%M:%SZ')" "$type" "$*" } docker_process_init_files() { @@ -48,7 +48,6 @@ chown -R www-data:www-data /var/www/html/storage # Clear and cache config in production if [ "$APP_ENV" = "production" ]; then - gosu www-data php artisan config:cache gosu www-data php artisan optimize gosu www-data php artisan package:discover gosu www-data php artisan migrate --force @@ -72,4 +71,4 @@ fi echo "Starting supervisord..." # Start supervisord in the foreground -exec /usr/bin/supervisord -n -c /etc/supervisor/conf.d/supervisord.conf \ No newline at end of file +exec /usr/bin/supervisord -n -c /etc/supervisor/conf.d/supervisord.conf