upgraded nginx to 1.31.0
CI / Build nginx docker images (push) Successful in 7m21s

This commit is contained in:
2026-05-15 22:13:12 +08:00
parent 1f6c90db8c
commit 7b1b154e95
2 changed files with 11 additions and 10 deletions
+8 -6
View File
@@ -31,12 +31,13 @@ jobs:
ssh: default=/home/luser/.ssh/id_ed25519 ssh: default=/home/luser/.ssh/id_ed25519
tags: | tags: |
"gitea.woggioni.net/woggioni/nginx:latest" "gitea.woggioni.net/woggioni/nginx:latest"
"gitea.woggioni.net/woggioni/nginx:v1.30.0" "gitea.woggioni.net/woggioni/nginx:v1.31.0"
secrets: | secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }} GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: | build-args: |
LIBRESSL_VERSION=4.2.1 LIBRESSL_VERSION=4.3.1
NGINX_VERSION=1.30.0 NGINX_VERSION=1.31.0
NJS_VERSION=0.9.8
NGINX_BRANCH=vanilla NGINX_BRANCH=vanilla
- -
name: Build and push nginx custom images name: Build and push nginx custom images
@@ -53,10 +54,11 @@ jobs:
ssh: default=/home/luser/.ssh/id_ed25519 ssh: default=/home/luser/.ssh/id_ed25519
tags: | tags: |
"gitea.woggioni.net/woggioni/nginx:woggioni" "gitea.woggioni.net/woggioni/nginx:woggioni"
"gitea.woggioni.net/woggioni/nginx:v1.30.0-woggioni" "gitea.woggioni.net/woggioni/nginx:v1.31.0-woggioni"
secrets: | secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }} GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: | build-args: |
LIBRESSL_VERSION=4.2.1 LIBRESSL_VERSION=4.3.1
NGINX_VERSION=1.30.0 NGINX_VERSION=1.31.0
NJS_VERSION=0.9.8
NGINX_BRANCH=woggioni NGINX_BRANCH=woggioni
+3 -4
View File
@@ -2,7 +2,7 @@ ARG NGINX_BRANCH=vanilla
FROM alpine:3.23 AS base FROM alpine:3.23 AS base
FROM base AS build_stage_1 FROM base AS build_stage_1
ARG NGINX_VERSION LIBRESSL_VERSION ARG NGINX_VERSION LIBRESSL_VERSION NJS_VERSION
RUN --mount=type=cache,target=/var/cache/apk apk update RUN --mount=type=cache,target=/var/cache/apk apk update
RUN --mount=type=cache,target=/var/cache/apk apk add \ RUN --mount=type=cache,target=/var/cache/apk apk add \
autoconf \ autoconf \
@@ -34,8 +34,7 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
tar \ tar \
tzdata \ tzdata \
zlib \ zlib \
zlib-dev \ zlib-dev
mercurial
RUN adduser -D luser RUN adduser -D luser
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
@@ -69,7 +68,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
USER root USER root
WORKDIR / WORKDIR /
RUN hg clone http://hg.nginx.org/njs /njs ADD --chown=luser:luser git@github.com:nginx/njs.git#${NJS_VERSION} /njs
RUN chown luser:luser -R /njs RUN chown luser:luser -R /njs
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser