diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 3c76d87..02143d4 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -95,7 +95,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 diff --git a/8.1-nginx-prod/Dockerfile b/8.1-nginx-prod/Dockerfile index 7e03bcf..e77897c 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 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 607e7dc..a582209 100644 --- a/8.1-nginx-prod/supervisor.conf +++ b/8.1-nginx-prod/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 7860dd1..9785946 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 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 607e7dc..a582209 100644 --- a/8.1-nginx/supervisor.conf +++ b/8.1-nginx/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 64b5e3f..74dcba0 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 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 607e7dc..a582209 100644 --- a/8.2-nginx-prod/supervisor.conf +++ b/8.2-nginx-prod/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 d7bc7b6..e39c28e 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 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 607e7dc..a582209 100644 --- a/8.2-nginx/supervisor.conf +++ b/8.2-nginx/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 3294234..851ef1b 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 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 607e7dc..a582209 100644 --- a/8.3-nginx-prod/supervisor.conf +++ b/8.3-nginx-prod/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 7d224b7..633b4d4 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 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 607e7dc..a582209 100644 --- a/8.3-nginx/supervisor.conf +++ b/8.3-nginx/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 e9dc637..b3c070a 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 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 607e7dc..a582209 100644 --- a/8.4-nginx-prod/supervisor.conf +++ b/8.4-nginx-prod/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 a7a3026..49e1967 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 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 607e7dc..a582209 100644 --- a/8.4-nginx/supervisor.conf +++ b/8.4-nginx/supervisor.conf @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +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 15e4b37..6e4bfcb 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 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 607e7dc..a582209 100644 --- a/template/supervisor-conf.blade.php +++ b/template/supervisor-conf.blade.php @@ -1,3 +1,9 @@ +[supervisord] +logfile=/dev/stdout +logfile_maxbytes=0 +pidfile=/run/supervisord.pid +nodaemon=true + [program:nginx] depends_on = php-fpm command = nginx -g "daemon off;"