updated nginx to 1.29.2
Some checks failed
CI / Build nginx docker images (push) Has been cancelled

This commit is contained in:
2025-10-24 13:19:54 +08:00
parent a460a8224c
commit a006797fbb
3 changed files with 7 additions and 6 deletions

View File

@@ -37,11 +37,11 @@ jobs:
ssh: default=/home/luser/.ssh/id_ed25519
tags: |
"gitea.woggioni.net/woggioni/nginx:latest"
"gitea.woggioni.net/woggioni/nginx:v1.29.1"
"gitea.woggioni.net/woggioni/nginx:v1.29.2"
secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: |
NGINX_VERSION=1.29.1
NGINX_VERSION=1.29.2
NGINX_BRANCH=vanilla
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
@@ -58,11 +58,11 @@ jobs:
ssh: default=/home/luser/.ssh/id_ed25519
tags: |
"gitea.woggioni.net/woggioni/nginx:woggioni"
"gitea.woggioni.net/woggioni/nginx:v1.29.1-woggioni"
"gitea.woggioni.net/woggioni/nginx:v1.29.2-woggioni"
secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: |
NGINX_VERSION=1.29.1
NGINX_VERSION=1.29.2
NGINX_BRANCH=woggioni
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni
cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni

View File

@@ -97,7 +97,7 @@ RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps
COPY --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf
COPY conf/nginx.conf /etc/nginx/nginx.conf
COPY conf/nginx.vh.no-default.conf /etc/nginx/conf.d/default.conf
COPY conf/nginx.vh.no-default.conf /etc/nginx/conf.d/http/default.conf
COPY conf/dhparam /etc/nginx/dhparam
LABEL description="NGINX Docker built top of LibreSSL" \

View File

@@ -124,5 +124,6 @@ http {
application/wasm;
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/conf.d/http/*.conf;
include /etc/nginx/conf.d/stream/*.conf
}