From a9440745efd5db8851831d8115b7acbc32d937c4 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Wed, 12 Nov 2025 16:59:44 -0300 Subject: [PATCH] Remove 8.0 | Bump h5bp to 5.0.1 --- .github/workflows/ci-cd.yml | 2 +- 8.0-swoole-nginx-prod/Dockerfile | 62 --------------------- 8.0-swoole-nginx-prod/default.tmpl | 72 ------------------------ 8.0-swoole-nginx-prod/entrypoint | 25 --------- 8.0-swoole-nginx-prod/supervisor.conf | 14 ----- 8.0-swoole-nginx/Dockerfile | 62 --------------------- 8.0-swoole-nginx/default.tmpl | 72 ------------------------ 8.0-swoole-nginx/entrypoint | 34 ------------ 8.0-swoole-nginx/supervisor.conf | 14 ----- 8.0-swoole-prod/Dockerfile | 5 -- 8.0-swoole/Dockerfile | 5 -- 8.1-swoole-nginx-prod/Dockerfile | 2 +- 8.1-swoole-nginx/Dockerfile | 2 +- 8.2-swoole-nginx-prod/Dockerfile | 2 +- 8.2-swoole-nginx/Dockerfile | 2 +- 8.3-swoole-nginx-prod/Dockerfile | 2 +- 8.3-swoole-nginx/Dockerfile | 2 +- 8.4-swoole-nginx-prod/Dockerfile | 2 +- 8.4-swoole-nginx/Dockerfile | 2 +- README.md | 5 +- fwd-template.json | 80 --------------------------- template/Dockerfile-nginx.blade.php | 2 +- 22 files changed, 12 insertions(+), 458 deletions(-) delete mode 100644 8.0-swoole-nginx-prod/Dockerfile delete mode 100644 8.0-swoole-nginx-prod/default.tmpl delete mode 100644 8.0-swoole-nginx-prod/entrypoint delete mode 100644 8.0-swoole-nginx-prod/supervisor.conf delete mode 100644 8.0-swoole-nginx/Dockerfile delete mode 100644 8.0-swoole-nginx/default.tmpl delete mode 100644 8.0-swoole-nginx/entrypoint delete mode 100644 8.0-swoole-nginx/supervisor.conf delete mode 100644 8.0-swoole-prod/Dockerfile delete mode 100644 8.0-swoole/Dockerfile diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index f82b633..5f4e0c7 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: - version: ['8.0-swoole', '8.1-swoole', '8.2-swoole', '8.3-swoole', '8.4-swoole'] + version: ['8.1-swoole', '8.2-swoole', '8.3-swoole', '8.4-swoole'] type: ['', '-prod'] steps: diff --git a/8.0-swoole-nginx-prod/Dockerfile b/8.0-swoole-nginx-prod/Dockerfile deleted file mode 100644 index d4e596e..0000000 --- a/8.0-swoole-nginx-prod/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -FROM debian AS cert - -WORKDIR /kool/ssl - -RUN apt-get update && \ - apt-get install -y openssl && \ - openssl genrsa -des3 -passout pass:x -out server.pass.key 2048 && \ - openssl rsa -passin pass:x -in server.pass.key -out _.localhost.key && \ - rm server.pass.key && \ - openssl req -new -key _.localhost.key -out server.csr \ - -subj "/C=XX/ST=XX/L=XX/O=Kool-Local/OU=Localhost/CN=*.localhost" && \ - openssl x509 -req -days 365 -in server.csr -signkey _.localhost.key -out _.localhost.crt && \ - openssl x509 -in _.localhost.crt -out _.localhost.pem - -FROM kooldev/php:8.0-swoole-prod - -ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ - NGINX_LISTEN=80 \ - NGINX_HTTPS=false \ - NGINX_LISTEN_HTTPS=443 \ - NGINX_HTTPS_CERT=/kool/ssl/_.localhost.pem \ - NGINX_HTTPS_CERT_KEY=/kool/ssl/_.localhost.key \ - NGINX_ROOT=/app/public \ - NGINX_INDEX=index.php \ - NGINX_CLIENT_MAX_BODY_SIZE=25M \ - NGINX_PHP_FPM=unix:/run/php-fpm.sock \ - NGINX_FASTCGI_READ_TIMEOUT=60s \ - NGINX_FASTCGI_BUFFERS='8 8k' \ - 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 \ - && chown -R kool:kool /var/lib/nginx \ - && chmod 770 /var/lib/nginx/tmp \ - && ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - # add h5bp/server-configs-nginx - && mkdir -p /etc/nginx/conf.d \ - && mkdir /etc/nginx/h5bp \ - && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ - && tar xzvf h5bp.tgz \ - && rm -f h5bp.tgz \ - && mv server-configs-nginx-*/h5bp/* . \ - && mv server-configs-nginx-*/nginx.conf /etc/nginx/nginx.conf \ - && sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \ - && mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \ - && rm -rf server-configs-nginx-* \ - && curl -L https://raw.githubusercontent.com/nginxinc/docker-nginx/master/entrypoint/30-tune-worker-processes.sh -o /kool/30-tune-worker-processes.sh \ - && chmod +x /kool/30-tune-worker-processes.sh - -COPY supervisor.conf /kool/supervisor.conf -COPY default.tmpl /kool/default.tmpl -COPY entrypoint /kool/entrypoint -COPY --from=cert /kool/ssl /kool/ssl -RUN chmod +x /kool/entrypoint - -EXPOSE 80 - -CMD [ "supervisord", "-c", "/kool/supervisor.conf" ] diff --git a/8.0-swoole-nginx-prod/default.tmpl b/8.0-swoole-nginx-prod/default.tmpl deleted file mode 100644 index cf13ec7..0000000 --- a/8.0-swoole-nginx-prod/default.tmpl +++ /dev/null @@ -1,72 +0,0 @@ -map $http_upgrade $connection_upgrade { - default upgrade; - '' close; -} - -server { - listen {{ .Env.NGINX_LISTEN }} default_server; - server_name _; -{{ if isTrue .Env.NGINX_HTTPS }} - listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2; - ssl_certificate {{ .Env.NGINX_HTTPS_CERT }}; - ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }}; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers HIGH:!aNULL:!MD5; -{{ end }} - root {{ .Env.NGINX_ROOT }}; - index {{ .Env.NGINX_INDEX }}; - charset utf-8; - - location = /favicon.ico { log_not_found off; access_log off; } - location = /robots.txt { log_not_found off; access_log off; } - - client_max_body_size {{ .Env.NGINX_CLIENT_MAX_BODY_SIZE }}; - - error_page 404 /index.php; - - location /index.php { - try_files /not_exists @octane; - } - - location / { - try_files $uri $uri/ @octane; - - add_header X-Served-By kool.dev; - } - - location @octane { - set $suffix ""; - - if ($uri = /index.php) { - set $suffix ?$query_string; - } - - proxy_http_version 1.1; - proxy_set_header Host $http_host; - proxy_set_header Scheme $scheme; - proxy_set_header SERVER_PORT $server_port; - proxy_set_header REMOTE_ADDR $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - proxy_pass http://127.0.0.1:8000$suffix; - } - - location ~ /\.ht { - deny all; - } - - # good practices - add_header X-Frame-Options "SAMEORIGIN"; - - # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; - include h5bp/security/referrer-policy.conf; - include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; - - # performance enhancements (mostly for caching static data) - include h5bp/web_performance/cache-file-descriptors.conf; - include h5bp/web_performance/pre-compressed_content_gzip.conf; -} diff --git a/8.0-swoole-nginx-prod/entrypoint b/8.0-swoole-nginx-prod/entrypoint deleted file mode 100644 index 535c40e..0000000 --- a/8.0-swoole-nginx-prod/entrypoint +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -set -e - - -# Run as current user -CURRENT_USER=${ASUSER:-${UID:-0}} - -if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then - usermod -u $CURRENT_USER kool -fi - -dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf - -/kool/30-tune-worker-processes.sh - -# Run entrypoint if provided -if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then - bash $ENTRYPOINT -fi - -if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then - exec "$@" -else - exec su-exec kool "$@" -fi diff --git a/8.0-swoole-nginx-prod/supervisor.conf b/8.0-swoole-nginx-prod/supervisor.conf deleted file mode 100644 index 1737e28..0000000 --- a/8.0-swoole-nginx-prod/supervisor.conf +++ /dev/null @@ -1,14 +0,0 @@ -[program:nginx] -depends_on = octane -command = nginx -g "daemon off;" -autorestart = true -stopasgroup = true -stderr_logfile = /dev/stderr -stdout_logfile = /dev/stdout - -[program:octane] -command = su-exec kool php artisan octane:start -autorestart = true -stopasgroup = true -stderr_logfile = /dev/stderr -stdout_logfile = /dev/stdout diff --git a/8.0-swoole-nginx/Dockerfile b/8.0-swoole-nginx/Dockerfile deleted file mode 100644 index 554693b..0000000 --- a/8.0-swoole-nginx/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -FROM debian AS cert - -WORKDIR /kool/ssl - -RUN apt-get update && \ - apt-get install -y openssl && \ - openssl genrsa -des3 -passout pass:x -out server.pass.key 2048 && \ - openssl rsa -passin pass:x -in server.pass.key -out _.localhost.key && \ - rm server.pass.key && \ - openssl req -new -key _.localhost.key -out server.csr \ - -subj "/C=XX/ST=XX/L=XX/O=Kool-Local/OU=Localhost/CN=*.localhost" && \ - openssl x509 -req -days 365 -in server.csr -signkey _.localhost.key -out _.localhost.crt && \ - openssl x509 -in _.localhost.crt -out _.localhost.pem - -FROM kooldev/php:8.0-swoole - -ENV PHP_FPM_LISTEN=/run/php-fpm.sock \ - NGINX_LISTEN=80 \ - NGINX_HTTPS=false \ - NGINX_LISTEN_HTTPS=443 \ - NGINX_HTTPS_CERT=/kool/ssl/_.localhost.pem \ - NGINX_HTTPS_CERT_KEY=/kool/ssl/_.localhost.key \ - NGINX_ROOT=/app/public \ - NGINX_INDEX=index.php \ - NGINX_CLIENT_MAX_BODY_SIZE=25M \ - NGINX_PHP_FPM=unix:/run/php-fpm.sock \ - NGINX_FASTCGI_READ_TIMEOUT=60s \ - NGINX_FASTCGI_BUFFERS='8 8k' \ - 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 \ - && chown -R kool:kool /var/lib/nginx \ - && chmod 770 /var/lib/nginx/tmp \ - && ln -sf /dev/stdout /var/log/nginx/access.log \ - && ln -sf /dev/stderr /var/log/nginx/error.log \ - # add h5bp/server-configs-nginx - && mkdir -p /etc/nginx/conf.d \ - && mkdir /etc/nginx/h5bp \ - && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ - && tar xzvf h5bp.tgz \ - && rm -f h5bp.tgz \ - && mv server-configs-nginx-*/h5bp/* . \ - && mv server-configs-nginx-*/nginx.conf /etc/nginx/nginx.conf \ - && sed -i "s|^user .*|user\ kool kool;|g" /etc/nginx/nginx.conf \ - && mv server-configs-nginx-*/mime.types /etc/nginx/mime.types \ - && rm -rf server-configs-nginx-* \ - && curl -L https://raw.githubusercontent.com/nginxinc/docker-nginx/master/entrypoint/30-tune-worker-processes.sh -o /kool/30-tune-worker-processes.sh \ - && chmod +x /kool/30-tune-worker-processes.sh - -COPY supervisor.conf /kool/supervisor.conf -COPY default.tmpl /kool/default.tmpl -COPY entrypoint /kool/entrypoint -COPY --from=cert /kool/ssl /kool/ssl -RUN chmod +x /kool/entrypoint - -EXPOSE 80 - -CMD [ "supervisord", "-c", "/kool/supervisor.conf" ] diff --git a/8.0-swoole-nginx/default.tmpl b/8.0-swoole-nginx/default.tmpl deleted file mode 100644 index cf13ec7..0000000 --- a/8.0-swoole-nginx/default.tmpl +++ /dev/null @@ -1,72 +0,0 @@ -map $http_upgrade $connection_upgrade { - default upgrade; - '' close; -} - -server { - listen {{ .Env.NGINX_LISTEN }} default_server; - server_name _; -{{ if isTrue .Env.NGINX_HTTPS }} - listen {{ .Env.NGINX_LISTEN_HTTPS }} ssl http2; - ssl_certificate {{ .Env.NGINX_HTTPS_CERT }}; - ssl_certificate_key {{ .Env.NGINX_HTTPS_CERT_KEY }}; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers HIGH:!aNULL:!MD5; -{{ end }} - root {{ .Env.NGINX_ROOT }}; - index {{ .Env.NGINX_INDEX }}; - charset utf-8; - - location = /favicon.ico { log_not_found off; access_log off; } - location = /robots.txt { log_not_found off; access_log off; } - - client_max_body_size {{ .Env.NGINX_CLIENT_MAX_BODY_SIZE }}; - - error_page 404 /index.php; - - location /index.php { - try_files /not_exists @octane; - } - - location / { - try_files $uri $uri/ @octane; - - add_header X-Served-By kool.dev; - } - - location @octane { - set $suffix ""; - - if ($uri = /index.php) { - set $suffix ?$query_string; - } - - proxy_http_version 1.1; - proxy_set_header Host $http_host; - proxy_set_header Scheme $scheme; - proxy_set_header SERVER_PORT $server_port; - proxy_set_header REMOTE_ADDR $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - - proxy_pass http://127.0.0.1:8000$suffix; - } - - location ~ /\.ht { - deny all; - } - - # good practices - add_header X-Frame-Options "SAMEORIGIN"; - - # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; - include h5bp/security/referrer-policy.conf; - include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; - - # performance enhancements (mostly for caching static data) - include h5bp/web_performance/cache-file-descriptors.conf; - include h5bp/web_performance/pre-compressed_content_gzip.conf; -} diff --git a/8.0-swoole-nginx/entrypoint b/8.0-swoole-nginx/entrypoint deleted file mode 100644 index 2780e2e..0000000 --- a/8.0-swoole-nginx/entrypoint +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -set -e - -if [ "$ENABLE_XDEBUG" == "true" ]; then - docker-php-ext-enable xdebug >> /dev/null 2>&1 - - if [ $? != "0" ]; then - echo "[ERROR] An error happened enabling xdebug" - - exit 1 - fi -fi - -# Run as current user -CURRENT_USER=${ASUSER:-${UID:-0}} - -if [ ! -z "$CURRENT_USER" ] && [ "$CURRENT_USER" != "0" ]; then - usermod -u $CURRENT_USER kool -fi - -dockerize -template /kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini -template /kool/zz-docker.tmpl:/usr/local/etc/php-fpm.d/zz-docker.conf -template /kool/default.tmpl:/etc/nginx/conf.d/default.conf - -/kool/30-tune-worker-processes.sh - -# Run entrypoint if provided -if [ ! -z "$ENTRYPOINT" ] && [ -f "$ENTRYPOINT" ]; then - bash $ENTRYPOINT -fi - -if [ "$1" = "sh" ] || [ "$1" = "bash" ] || [ "$1" = "php-fpm" ] || [ "$1" = "nginx" ] || [ "$1" = "supervisord" ]; then - exec "$@" -else - exec su-exec kool "$@" -fi diff --git a/8.0-swoole-nginx/supervisor.conf b/8.0-swoole-nginx/supervisor.conf deleted file mode 100644 index ac7aa23..0000000 --- a/8.0-swoole-nginx/supervisor.conf +++ /dev/null @@ -1,14 +0,0 @@ -[program:nginx] -depends_on = octane -command = nginx -g "daemon off;" -autorestart = true -stopasgroup = true -stderr_logfile = /dev/stderr -stdout_logfile = /dev/stdout - -[program:octane] -command = su-exec kool php artisan octane:start --watch -autorestart = true -stopasgroup = true -stderr_logfile = /dev/stderr -stdout_logfile = /dev/stdout diff --git a/8.0-swoole-prod/Dockerfile b/8.0-swoole-prod/Dockerfile deleted file mode 100644 index 27d619a..0000000 --- a/8.0-swoole-prod/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM kooldev/php:8.0-prod - -COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ - -RUN install-php-extensions swoole diff --git a/8.0-swoole/Dockerfile b/8.0-swoole/Dockerfile deleted file mode 100644 index 0121e31..0000000 --- a/8.0-swoole/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM kooldev/php:8.0-node - -COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/ - -RUN install-php-extensions swoole diff --git a/8.1-swoole-nginx-prod/Dockerfile b/8.1-swoole-nginx-prod/Dockerfile index fdf7341..b632b0a 100644 --- a/8.1-swoole-nginx-prod/Dockerfile +++ b/8.1-swoole-nginx-prod/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.1-swoole-nginx/Dockerfile b/8.1-swoole-nginx/Dockerfile index ac38938..75343e2 100644 --- a/8.1-swoole-nginx/Dockerfile +++ b/8.1-swoole-nginx/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.2-swoole-nginx-prod/Dockerfile b/8.2-swoole-nginx-prod/Dockerfile index e28f661..699f270 100644 --- a/8.2-swoole-nginx-prod/Dockerfile +++ b/8.2-swoole-nginx-prod/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.2-swoole-nginx/Dockerfile b/8.2-swoole-nginx/Dockerfile index 9cf27e3..b4cb6b2 100644 --- a/8.2-swoole-nginx/Dockerfile +++ b/8.2-swoole-nginx/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.3-swoole-nginx-prod/Dockerfile b/8.3-swoole-nginx-prod/Dockerfile index a59b0a2..e7b5de8 100644 --- a/8.3-swoole-nginx-prod/Dockerfile +++ b/8.3-swoole-nginx-prod/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.3-swoole-nginx/Dockerfile b/8.3-swoole-nginx/Dockerfile index b7b172d..ceb2f55 100644 --- a/8.3-swoole-nginx/Dockerfile +++ b/8.3-swoole-nginx/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.4-swoole-nginx-prod/Dockerfile b/8.4-swoole-nginx-prod/Dockerfile index ff178e9..9576fbb 100644 --- a/8.4-swoole-nginx-prod/Dockerfile +++ b/8.4-swoole-nginx-prod/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/8.4-swoole-nginx/Dockerfile b/8.4-swoole-nginx/Dockerfile index 1d9234d..4f76557 100644 --- a/8.4-swoole-nginx/Dockerfile +++ b/8.4-swoole-nginx/Dockerfile @@ -40,7 +40,7 @@ RUN curl -L https://github.com/ochinchina/supervisord/releases/download/v0.6.3/s && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \ diff --git a/README.md b/README.md index d17b7b2..4f3a01d 100644 --- a/README.md +++ b/README.md @@ -26,10 +26,9 @@ This image is based on [kooldev/php](https://github.com/kool-dev/docker-php), pl - [8.1](https://github.com/kool-dev/docker-php-swoole/blob/master/8.1-swoole/Dockerfile) and [8.1-prod](https://github.com/kool-dev/docker-php-swoole/blob/master/8.1-swoole-prod/Dockerfile) - [8.1-nginx](https://github.com/kool-dev/docker-php-swoole/blob/master/8.1-swoole-nginx/Dockerfile) and [8.1-nginx-prod](https://github.com/kool-dev/docker-php-swoole/blob/master/8.1-swoole-nginx-prod/Dockerfile) -### 8.0 +### Legacy Versions -- [8.0](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole/Dockerfile) and [8.0-prod](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole-prod/Dockerfile) -- [8.0-nginx](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole-nginx/Dockerfile) and [8.0-nginx-prod](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole-nginx-prod/Dockerfile) +- [8.0](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole/Dockerfile), [8.0-prod](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole-prod/Dockerfile), [8.0-nginx](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole-nginx/Dockerfile), [8.0-nginx-prod](https://github.com/kool-dev/docker-php-swoole/blob/master/8.0-swoole-nginx-prod/Dockerfile) ## Environment Variables diff --git a/fwd-template.json b/fwd-template.json index 2364dbe..b81eeb7 100644 --- a/fwd-template.json +++ b/fwd-template.json @@ -1,86 +1,6 @@ { "output": ".", "builds": [ - { - "name": "8.0-swoole", - "data": { - "from": "kooldev/php:8.0-node", - "prod": false, - "nginx": false - }, - "files": [ - { - "name": "Dockerfile", - "path": "template/Dockerfile" - } - ] - }, - { - "name": "8.0-swoole-prod", - "data": { - "from": "kooldev/php:8.0-prod", - "prod": true, - "nginx": false - }, - "files": [ - { - "name": "Dockerfile", - "path": "template/Dockerfile" - } - ] - }, - { - "name": "8.0-swoole-nginx", - "data": { - "from": "kooldev/php:8.0-swoole", - "prod": false, - "nginx": true - }, - "files": [ - { - "name": "Dockerfile", - "path": "template/Dockerfile-nginx" - }, - { - "name": "entrypoint", - "path": "template/entrypoint" - }, - { - "name": "default.tmpl", - "path": "template/default-tmpl" - }, - { - "name": "supervisor.conf", - "path": "template/supervisor-conf" - } - ] - }, - { - "name": "8.0-swoole-nginx-prod", - "data": { - "from": "kooldev/php:8.0-swoole-prod", - "prod": true, - "nginx": true - }, - "files": [ - { - "name": "Dockerfile", - "path": "template/Dockerfile-nginx" - }, - { - "name": "entrypoint", - "path": "template/entrypoint" - }, - { - "name": "default.tmpl", - "path": "template/default-tmpl" - }, - { - "name": "supervisor.conf", - "path": "template/supervisor-conf" - } - ] - }, { "name": "8.1-swoole", "data": { diff --git a/template/Dockerfile-nginx.blade.php b/template/Dockerfile-nginx.blade.php index a0bda13..15e4b37 100644 --- a/template/Dockerfile-nginx.blade.php +++ b/template/Dockerfile-nginx.blade.php @@ -40,7 +40,7 @@ && mkdir -p /etc/nginx/conf.d \ && mkdir /etc/nginx/h5bp \ && cd /etc/nginx/h5bp \ - && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/3.3.0.tar.gz -O h5bp.tgz \ + && wget https://github.com/h5bp/server-configs-nginx/archive/refs/tags/5.0.1.tar.gz -O h5bp.tgz \ && tar xzvf h5bp.tgz \ && rm -f h5bp.tgz \ && mv server-configs-nginx-*/h5bp/* . \