Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@ on:
push:
workflow_dispatch:
schedule:
- cron: '0 0 * * 0'
- cron: "0 0 * * 0"

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
version: ['8.1', '8.2', '8.3', '8.4']
type: ['', '-prod']
version: ["8.1", "8.2", "8.3", "8.4"]
type: ["", "-prod"]

steps:
- name: Checkout code
Expand Down Expand Up @@ -96,7 +96,7 @@ jobs:

docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v
docker run kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -T
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
Expand Down
4 changes: 1 addition & 3 deletions 8.1-nginx-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.1-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.1-nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.1-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.2-nginx-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.2-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.2-nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.2-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.3-nginx-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.3-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.3-nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.3-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.4-nginx-prod/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.4-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions 8.4-nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
25 changes: 20 additions & 5 deletions 8.4-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
[supervisord]
logfile=/dev/stdout
logfile_maxbytes=0
pidfile=/run/supervisord.pid
nodaemon=true

[program:php-fpm]
command = php-fpm
priority = 10
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0

[program:php-fpm]
command = php-fpm
[program:nginx]
command = nginx -g "daemon off;"
priority = 20
autorestart = true
stopasgroup = true
killasgroup = true
stderr_logfile = /dev/stderr
stdout_logfile = /dev/stdout
stderr_logfile_maxbytes = 0
stdout_logfile_maxbytes = 0
4 changes: 1 addition & 3 deletions template/Dockerfile-nginx.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
Loading