From 7bedcbed208259f1a51b9091f17d09620644be39 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 29 Apr 2025 13:05:05 -0300 Subject: [PATCH 1/5] Adding Supervisord Header Config --- 8.0-nginx-prod/Dockerfile | 4 +--- 8.0-nginx-prod/supervisor.conf | 4 ++++ 8.0-nginx/Dockerfile | 4 +--- 8.0-nginx/supervisor.conf | 4 ++++ 8.1-nginx-prod/Dockerfile | 4 +--- 8.1-nginx-prod/supervisor.conf | 4 ++++ 8.1-nginx/Dockerfile | 4 +--- 8.1-nginx/supervisor.conf | 4 ++++ 8.2-nginx-prod/Dockerfile | 4 +--- 8.2-nginx-prod/supervisor.conf | 4 ++++ 8.2-nginx/Dockerfile | 4 +--- 8.2-nginx/supervisor.conf | 4 ++++ 8.3-nginx-prod/Dockerfile | 4 +--- 8.3-nginx-prod/supervisor.conf | 4 ++++ 8.3-nginx/Dockerfile | 4 +--- 8.3-nginx/supervisor.conf | 4 ++++ 8.4-nginx-prod/Dockerfile | 4 +--- 8.4-nginx-prod/supervisor.conf | 4 ++++ 8.4-nginx/Dockerfile | 4 +--- 8.4-nginx/supervisor.conf | 4 ++++ template/Dockerfile-nginx.blade.php | 4 +--- template/supervisor-conf.blade.php | 4 ++++ 22 files changed, 55 insertions(+), 33 deletions(-) diff --git a/8.0-nginx-prod/Dockerfile b/8.0-nginx-prod/Dockerfile index 1d076d0..b3c4af6 100644 --- a/8.0-nginx-prod/Dockerfile +++ b/8.0-nginx-prod/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.0-nginx-prod/supervisor.conf b/8.0-nginx-prod/supervisor.conf index 607e7dc..931f546 100644 --- a/8.0-nginx-prod/supervisor.conf +++ b/8.0-nginx-prod/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.0-nginx/Dockerfile b/8.0-nginx/Dockerfile index 1dc8c1d..f72fe8a 100644 --- a/8.0-nginx/Dockerfile +++ b/8.0-nginx/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.0-nginx/supervisor.conf b/8.0-nginx/supervisor.conf index 607e7dc..931f546 100644 --- a/8.0-nginx/supervisor.conf +++ b/8.0-nginx/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.1-nginx-prod/Dockerfile b/8.1-nginx-prod/Dockerfile index 9a85d6b..65675f9 100644 --- a/8.1-nginx-prod/Dockerfile +++ b/8.1-nginx-prod/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.1-nginx-prod/supervisor.conf b/8.1-nginx-prod/supervisor.conf index 607e7dc..931f546 100644 --- a/8.1-nginx-prod/supervisor.conf +++ b/8.1-nginx-prod/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.1-nginx/Dockerfile b/8.1-nginx/Dockerfile index ad19828..834cbfd 100644 --- a/8.1-nginx/Dockerfile +++ b/8.1-nginx/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.1-nginx/supervisor.conf b/8.1-nginx/supervisor.conf index 607e7dc..931f546 100644 --- a/8.1-nginx/supervisor.conf +++ b/8.1-nginx/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.2-nginx-prod/Dockerfile b/8.2-nginx-prod/Dockerfile index 41cd1c4..294b893 100644 --- a/8.2-nginx-prod/Dockerfile +++ b/8.2-nginx-prod/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.2-nginx-prod/supervisor.conf b/8.2-nginx-prod/supervisor.conf index 607e7dc..931f546 100644 --- a/8.2-nginx-prod/supervisor.conf +++ b/8.2-nginx-prod/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.2-nginx/Dockerfile b/8.2-nginx/Dockerfile index 2d523a2..ffda1d8 100644 --- a/8.2-nginx/Dockerfile +++ b/8.2-nginx/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.2-nginx/supervisor.conf b/8.2-nginx/supervisor.conf index 607e7dc..931f546 100644 --- a/8.2-nginx/supervisor.conf +++ b/8.2-nginx/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.3-nginx-prod/Dockerfile b/8.3-nginx-prod/Dockerfile index 786e485..1a29142 100644 --- a/8.3-nginx-prod/Dockerfile +++ b/8.3-nginx-prod/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.3-nginx-prod/supervisor.conf b/8.3-nginx-prod/supervisor.conf index 607e7dc..931f546 100644 --- a/8.3-nginx-prod/supervisor.conf +++ b/8.3-nginx-prod/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.3-nginx/Dockerfile b/8.3-nginx/Dockerfile index 3248cd4..be51787 100644 --- a/8.3-nginx/Dockerfile +++ b/8.3-nginx/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.3-nginx/supervisor.conf b/8.3-nginx/supervisor.conf index 607e7dc..931f546 100644 --- a/8.3-nginx/supervisor.conf +++ b/8.3-nginx/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.4-nginx-prod/Dockerfile b/8.4-nginx-prod/Dockerfile index 14c46e2..9deeacc 100644 --- a/8.4-nginx-prod/Dockerfile +++ b/8.4-nginx-prod/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.4-nginx-prod/supervisor.conf b/8.4-nginx-prod/supervisor.conf index 607e7dc..931f546 100644 --- a/8.4-nginx-prod/supervisor.conf +++ b/8.4-nginx-prod/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/8.4-nginx/Dockerfile b/8.4-nginx/Dockerfile index 81883b3..6b31145 100644 --- a/8.4-nginx/Dockerfile +++ b/8.4-nginx/Dockerfile @@ -29,9 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.4-nginx/supervisor.conf b/8.4-nginx/supervisor.conf index 607e7dc..931f546 100644 --- a/8.4-nginx/supervisor.conf +++ b/8.4-nginx/supervisor.conf @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" diff --git a/template/Dockerfile-nginx.blade.php b/template/Dockerfile-nginx.blade.php index a0bda13..c6262eb 100644 --- a/template/Dockerfile-nginx.blade.php +++ b/template/Dockerfile-nginx.blade.php @@ -29,9 +29,7 @@ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/supervisord_static_0.6.3_linux_amd64 -o /usr/local/bin/supervisord \ - && chmod +x /usr/local/bin/supervisord \ - && apk add --no-cache nginx \ +RUN apk add --no-cache nginx supervisord \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/template/supervisor-conf.blade.php b/template/supervisor-conf.blade.php index 607e7dc..931f546 100644 --- a/template/supervisor-conf.blade.php +++ b/template/supervisor-conf.blade.php @@ -1,3 +1,7 @@ +[supervisord] +logfile=/dev/stdout +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;" From 39708ad938baacc4f02bdb87a79356a882b6eb9a Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 29 Apr 2025 13:17:02 -0300 Subject: [PATCH 2/5] add ci --- .github/workflows/ci-cd.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 8f96781..68de35e 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -3,6 +3,7 @@ name: CI/CD on: push: workflow_dispatch: + pull_request: schedule: - cron: '0 0 * * 0' From c62e736dc7587dd0d607203446093ed886a3d173 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 29 Apr 2025 13:19:10 -0300 Subject: [PATCH 3/5] tweak --- .github/workflows/ci-cd.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 68de35e..8f96781 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -3,7 +3,6 @@ name: CI/CD on: push: workflow_dispatch: - pull_request: schedule: - cron: '0 0 * * 0' From 90b5573dbcabad746db8ba90bd30ae830d515b73 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 29 Apr 2025 13:21:15 -0300 Subject: [PATCH 4/5] tweak --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 8f96781..270af2a 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -93,7 +93,7 @@ jobs: docker run -e ENABLE_XDEBUG=true kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} php -m docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v - docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} supervisord version + docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} supervisord --version - name: Build and push (nginx) uses: docker/build-push-action@v6 From e99f246ae71a3c63076278ba4a79614383fc8e43 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Tue, 29 Apr 2025 14:05:39 -0300 Subject: [PATCH 5/5] tweak --- 8.0-nginx-prod/Dockerfile | 2 +- 8.0-nginx-prod/supervisor.conf | 2 ++ 8.0-nginx/Dockerfile | 2 +- 8.0-nginx/supervisor.conf | 2 ++ 8.1-nginx-prod/Dockerfile | 2 +- 8.1-nginx-prod/supervisor.conf | 2 ++ 8.1-nginx/Dockerfile | 2 +- 8.1-nginx/supervisor.conf | 2 ++ 8.2-nginx-prod/Dockerfile | 2 +- 8.2-nginx-prod/supervisor.conf | 2 ++ 8.2-nginx/Dockerfile | 2 +- 8.2-nginx/supervisor.conf | 2 ++ 8.3-nginx-prod/Dockerfile | 2 +- 8.3-nginx-prod/supervisor.conf | 2 ++ 8.3-nginx/Dockerfile | 2 +- 8.3-nginx/supervisor.conf | 2 ++ 8.4-nginx-prod/Dockerfile | 2 +- 8.4-nginx-prod/supervisor.conf | 2 ++ 8.4-nginx/Dockerfile | 2 +- 8.4-nginx/supervisor.conf | 2 ++ template/Dockerfile-nginx.blade.php | 2 +- template/supervisor-conf.blade.php | 2 ++ 22 files changed, 33 insertions(+), 11 deletions(-) diff --git a/8.0-nginx-prod/Dockerfile b/8.0-nginx-prod/Dockerfile index b3c4af6..4fda1a4 100644 --- a/8.0-nginx-prod/Dockerfile +++ b/8.0-nginx-prod/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.0-nginx-prod/supervisor.conf b/8.0-nginx-prod/supervisor.conf index 931f546..a582209 100644 --- a/8.0-nginx-prod/supervisor.conf +++ b/8.0-nginx-prod/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.0-nginx/Dockerfile b/8.0-nginx/Dockerfile index f72fe8a..265c89d 100644 --- a/8.0-nginx/Dockerfile +++ b/8.0-nginx/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.0-nginx/supervisor.conf b/8.0-nginx/supervisor.conf index 931f546..a582209 100644 --- a/8.0-nginx/supervisor.conf +++ b/8.0-nginx/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.1-nginx-prod/Dockerfile b/8.1-nginx-prod/Dockerfile index 65675f9..ebba932 100644 --- a/8.1-nginx-prod/Dockerfile +++ b/8.1-nginx-prod/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.1-nginx-prod/supervisor.conf b/8.1-nginx-prod/supervisor.conf index 931f546..a582209 100644 --- a/8.1-nginx-prod/supervisor.conf +++ b/8.1-nginx-prod/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.1-nginx/Dockerfile b/8.1-nginx/Dockerfile index 834cbfd..38fd827 100644 --- a/8.1-nginx/Dockerfile +++ b/8.1-nginx/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.1-nginx/supervisor.conf b/8.1-nginx/supervisor.conf index 931f546..a582209 100644 --- a/8.1-nginx/supervisor.conf +++ b/8.1-nginx/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.2-nginx-prod/Dockerfile b/8.2-nginx-prod/Dockerfile index 294b893..1c0940e 100644 --- a/8.2-nginx-prod/Dockerfile +++ b/8.2-nginx-prod/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.2-nginx-prod/supervisor.conf b/8.2-nginx-prod/supervisor.conf index 931f546..a582209 100644 --- a/8.2-nginx-prod/supervisor.conf +++ b/8.2-nginx-prod/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.2-nginx/Dockerfile b/8.2-nginx/Dockerfile index ffda1d8..5b61e2b 100644 --- a/8.2-nginx/Dockerfile +++ b/8.2-nginx/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.2-nginx/supervisor.conf b/8.2-nginx/supervisor.conf index 931f546..a582209 100644 --- a/8.2-nginx/supervisor.conf +++ b/8.2-nginx/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.3-nginx-prod/Dockerfile b/8.3-nginx-prod/Dockerfile index 1a29142..db1afbe 100644 --- a/8.3-nginx-prod/Dockerfile +++ b/8.3-nginx-prod/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.3-nginx-prod/supervisor.conf b/8.3-nginx-prod/supervisor.conf index 931f546..a582209 100644 --- a/8.3-nginx-prod/supervisor.conf +++ b/8.3-nginx-prod/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.3-nginx/Dockerfile b/8.3-nginx/Dockerfile index be51787..56eaccb 100644 --- a/8.3-nginx/Dockerfile +++ b/8.3-nginx/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.3-nginx/supervisor.conf b/8.3-nginx/supervisor.conf index 931f546..a582209 100644 --- a/8.3-nginx/supervisor.conf +++ b/8.3-nginx/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.4-nginx-prod/Dockerfile b/8.4-nginx-prod/Dockerfile index 9deeacc..dd71776 100644 --- a/8.4-nginx-prod/Dockerfile +++ b/8.4-nginx-prod/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.4-nginx-prod/supervisor.conf b/8.4-nginx-prod/supervisor.conf index 931f546..a582209 100644 --- a/8.4-nginx-prod/supervisor.conf +++ b/8.4-nginx-prod/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/8.4-nginx/Dockerfile b/8.4-nginx/Dockerfile index 6b31145..6fb8888 100644 --- a/8.4-nginx/Dockerfile +++ b/8.4-nginx/Dockerfile @@ -29,7 +29,7 @@ ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/8.4-nginx/supervisor.conf b/8.4-nginx/supervisor.conf index 931f546..a582209 100644 --- a/8.4-nginx/supervisor.conf +++ b/8.4-nginx/supervisor.conf @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx] diff --git a/template/Dockerfile-nginx.blade.php b/template/Dockerfile-nginx.blade.php index c6262eb..42d730a 100644 --- a/template/Dockerfile-nginx.blade.php +++ b/template/Dockerfile-nginx.blade.php @@ -29,7 +29,7 @@ NGINX_FASTCGI_BUFFER_SIZE='16k' \ NGINX_ENTRYPOINT_WORKER_PROCESSES_AUTOTUNE=true -RUN apk add --no-cache nginx supervisord \ +RUN apk add --no-cache nginx supervisor \ && chown -R kool:kool /var/lib/nginx \ && chmod 770 /var/lib/nginx/tmp \ && ln -sf /dev/stdout /var/log/nginx/access.log \ diff --git a/template/supervisor-conf.blade.php b/template/supervisor-conf.blade.php index 931f546..a582209 100644 --- a/template/supervisor-conf.blade.php +++ b/template/supervisor-conf.blade.php @@ -1,5 +1,7 @@ [supervisord] logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid nodaemon=true [program:nginx]