Skip to content
Open
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: CI/CD
on:
push:
workflow_dispatch:
pull_request:
schedule:
- cron: '0 0 * * 0'

Expand Down
4 changes: 1 addition & 3 deletions 8.0-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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.0-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
4 changes: 1 addition & 3 deletions 8.0-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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.0-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.1-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.1-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.2-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.2-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.3-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.3-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.4-nginx-prod/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions 8.4-nginx/supervisor.conf
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down
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 supervisord \
&& chown -R kool:kool /var/lib/nginx \
&& chmod 770 /var/lib/nginx/tmp \
&& ln -sf /dev/stdout /var/log/nginx/access.log \
Expand Down
4 changes: 4 additions & 0 deletions template/supervisor-conf.blade.php
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[supervisord]
logfile=/dev/stdout
nodaemon=true

[program:nginx]
depends_on = php-fpm
command = nginx -g "daemon off;"
Expand Down