From efd053e18626584798ee05f872151ff90bc8f28b Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 15:49:48 +0200 Subject: [PATCH 1/3] Reduce noise in runtime logs --- 8.1/config/php/zz-php-fpm.conf | 4 ++++ 8.1/config/supervisor/supervisord.conf | 6 ++++++ 8.2/config/php/zz-php-fpm.conf | 4 ++++ 8.2/config/supervisor/supervisord.conf | 6 ++++++ 8.3/config/php/zz-php-fpm.conf | 4 ++++ 8.3/config/supervisor/supervisord.conf | 6 ++++++ 6 files changed, 30 insertions(+) diff --git a/8.1/config/php/zz-php-fpm.conf b/8.1/config/php/zz-php-fpm.conf index d4fb5e22..f045760d 100644 --- a/8.1/config/php/zz-php-fpm.conf +++ b/8.1/config/php/zz-php-fpm.conf @@ -3,12 +3,16 @@ [global] ; This pid file is used for Docker healthcheck pid = /run/php-fpm.pid +; Reduce noise in logs +log_level = error [www] user = docker catch_workers_output = yes listen = 0.0.0.0:9000 clear_env = no +; Do not log php-fpm accesses (see web container for http access) +access.log = /dev/null ; PHP (FPM) settings ; See zz-php.ini for global (CLI and FPM) PHP settings diff --git a/8.1/config/supervisor/supervisord.conf b/8.1/config/supervisor/supervisord.conf index 32c7217a..05e9e01e 100644 --- a/8.1/config/supervisor/supervisord.conf +++ b/8.1/config/supervisor/supervisord.conf @@ -4,3 +4,9 @@ nodaemon = true # This way logs can be reviewed with docker logs. # Additionalluy, logs from specific services are forwarded to individual files on disk. loglevel = debug +# Mute the "CRIT Supervisor is running as root" warning in logs. +user=root +# Mute the "CRIT Server 'unix_http_server' running without any HTTP authentication checking" warning in logs +[unix_http_server] +username = dummy +password = dummy diff --git a/8.2/config/php/zz-php-fpm.conf b/8.2/config/php/zz-php-fpm.conf index d4fb5e22..f045760d 100644 --- a/8.2/config/php/zz-php-fpm.conf +++ b/8.2/config/php/zz-php-fpm.conf @@ -3,12 +3,16 @@ [global] ; This pid file is used for Docker healthcheck pid = /run/php-fpm.pid +; Reduce noise in logs +log_level = error [www] user = docker catch_workers_output = yes listen = 0.0.0.0:9000 clear_env = no +; Do not log php-fpm accesses (see web container for http access) +access.log = /dev/null ; PHP (FPM) settings ; See zz-php.ini for global (CLI and FPM) PHP settings diff --git a/8.2/config/supervisor/supervisord.conf b/8.2/config/supervisor/supervisord.conf index 32c7217a..05e9e01e 100644 --- a/8.2/config/supervisor/supervisord.conf +++ b/8.2/config/supervisor/supervisord.conf @@ -4,3 +4,9 @@ nodaemon = true # This way logs can be reviewed with docker logs. # Additionalluy, logs from specific services are forwarded to individual files on disk. loglevel = debug +# Mute the "CRIT Supervisor is running as root" warning in logs. +user=root +# Mute the "CRIT Server 'unix_http_server' running without any HTTP authentication checking" warning in logs +[unix_http_server] +username = dummy +password = dummy diff --git a/8.3/config/php/zz-php-fpm.conf b/8.3/config/php/zz-php-fpm.conf index d4fb5e22..f045760d 100644 --- a/8.3/config/php/zz-php-fpm.conf +++ b/8.3/config/php/zz-php-fpm.conf @@ -3,12 +3,16 @@ [global] ; This pid file is used for Docker healthcheck pid = /run/php-fpm.pid +; Reduce noise in logs +log_level = error [www] user = docker catch_workers_output = yes listen = 0.0.0.0:9000 clear_env = no +; Do not log php-fpm accesses (see web container for http access) +access.log = /dev/null ; PHP (FPM) settings ; See zz-php.ini for global (CLI and FPM) PHP settings diff --git a/8.3/config/supervisor/supervisord.conf b/8.3/config/supervisor/supervisord.conf index 32c7217a..05e9e01e 100644 --- a/8.3/config/supervisor/supervisord.conf +++ b/8.3/config/supervisor/supervisord.conf @@ -4,3 +4,9 @@ nodaemon = true # This way logs can be reviewed with docker logs. # Additionalluy, logs from specific services are forwarded to individual files on disk. loglevel = debug +# Mute the "CRIT Supervisor is running as root" warning in logs. +user=root +# Mute the "CRIT Server 'unix_http_server' running without any HTTP authentication checking" warning in logs +[unix_http_server] +username = dummy +password = dummy From ef185cf38d5eb74906573255c4507a9a354c5537 Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 16:31:31 +0200 Subject: [PATCH 2/3] CI fixes --- .github/scripts/docker-tags.sh | 2 +- .github/workflows/default.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/scripts/docker-tags.sh b/.github/scripts/docker-tags.sh index 415664aa..1cc2f9ee 100755 --- a/.github/scripts/docker-tags.sh +++ b/.github/scripts/docker-tags.sh @@ -35,7 +35,7 @@ set_output() { # Print with new lines for output in build logs (IFS=$'\n'; echo "${outputArr[*]}") # Using newlines in output variables does not seem to work, so we'll use comas - (IFS=$','; echo tags="${outputArr[*]}" | tee -a ${$GITHUB_OUTPUT}) + (IFS=$','; echo tags="${outputArr[*]}" | tee -a ${GITHUB_OUTPUT}) } # Image tags diff --git a/.github/workflows/default.yaml b/.github/workflows/default.yaml index f7ea3766..f7dfbcd9 100644 --- a/.github/workflows/default.yaml +++ b/.github/workflows/default.yaml @@ -79,7 +79,7 @@ jobs: # Used for building heavy images that take too long to build using QEMU + for native arm64 testing. name: Switch to arm64 builder host if: ${{ env.ARCH == 'arm64' }} - uses: arwynfr/actions-docker-context@v2 + uses: docksal/actions/docker-context@main with: docker_host: "ssh://build-agent@${{ secrets.ARM64_HOST }}" context_name: arm64-host @@ -154,7 +154,7 @@ jobs: steps: - name: Setup Bats - uses: bats-core/bats-action@1.5.4 + uses: bats-core/bats-action@2.0.0 - name: Checkout uses: actions/checkout@v4 @@ -172,7 +172,7 @@ jobs: # Used for building heavy images that take too long to build using QEMU + for native arm64 testing. name: Switch to arm64 builder host if: ${{ env.ARCH == 'arm64' }} - uses: arwynfr/actions-docker-context@v2 + uses: docksal/actions/docker-context@main with: docker_host: "ssh://build-agent@${{ secrets.ARM64_HOST }}" context_name: arm64-host From 51482a643591f09d3baad2f11bccc0043f0d21ff Mon Sep 17 00:00:00 2001 From: Leonid Makarov Date: Fri, 19 Apr 2024 16:52:06 +0200 Subject: [PATCH 3/3] Fix platform.sh integration test --- tests/test.bats | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test.bats b/tests/test.bats index 049fce25..3aaf5670 100755 --- a/tests/test.bats +++ b/tests/test.bats @@ -359,7 +359,7 @@ _healthcheck_wait () unset output # Confirm authentication works - run docker exec -u docker "${NAME}" bash -lc 'platform auth:info -n' + run docker exec -u docker "${NAME}" bash -lc 'platform auth:info --no-interaction' [[ ${status} == 0 ]] [[ ! "${output}" =~ "Invalid API token" ]] [[ "${output}" =~ "developer@docksal.io" ]]