woggioni/docker-images
1
0
Fork 0
Code Actions Packages Releases Activity

updated nginx to 1.29.2
All checks were successful
CI / Build nginx docker images (push) Successful in 58s
Details

Browse Source
This commit is contained in:
Walter Oggioni
2025-10-24 13:19:54 +08:00
parent a460a8224c
commit d0b8059aa7
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.gitea/workflows/build-nginx.yaml
View File

@@ -37,11 +37,12 @@ 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.29.1" "gitea.woggioni.net/woggioni/nginx:v1.29.2"
secrets: | secrets: |
GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }} GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
build-args: | build-args: |
NGINX_VERSION=1.29.1 LIBRESSL_VERSION=4.2.0
NGINX_VERSION=1.29.2
NGINX_BRANCH=vanilla NGINX_BRANCH=vanilla
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-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 cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
@@ -58,11 +59,12 @@ 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.29.1-woggioni" "gitea.woggioni.net/woggioni/nginx:v1.29.2-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: |
NGINX_VERSION=1.29.1 LIBRESSL_VERSION=4.2.0
NGINX_VERSION=1.29.2
NGINX_BRANCH=woggioni NGINX_BRANCH=woggioni
cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-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 cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni

8
nginx/Dockerfile
View File

@@ -2,8 +2,7 @@ ARG NGINX_BRANCH=vanilla
FROM alpine:latest AS base FROM alpine:latest AS base
FROM alpine:latest AS build_stage_1 FROM alpine:latest AS build_stage_1
ARG NGINX_VERSION LIBRESSL_VERSION=4.1.0 ARG NGINX_VERSION LIBRESSL_VERSION
ENV NGINX_VERSION=${NGINX_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 \
@@ -41,8 +40,7 @@ RUN adduser -D luser
USER luser USER luser
WORKDIR /home/luser WORKDIR /home/luser
#RUN git clone --depth 1 --branch v4.0.0 https://github.com/libressl/portable.git libressl #RUN git clone --depth 1 --branch v4.2.0 https://github.com/libressl/portable.git libressl
#RUN git clone --depth 1 --branch v4.0.0 https://github.com/libressl/portable.git libressl
#ADD --chown=luser:luser git@github.com:libressl/portable.git#v${LIBRESSL_VERSION} libressl #ADD --chown=luser:luser git@github.com:libressl/portable.git#v${LIBRESSL_VERSION} libressl
ADD --chown=luser:luser https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz libressl.tgz ADD --chown=luser:luser https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz libressl.tgz
RUN tar -xzf libressl.tgz && mv libressl-${LIBRESSL_VERSION} libressl && rm libressl.tgz RUN tar -xzf libressl.tgz && mv libressl-${LIBRESSL_VERSION} libressl && rm libressl.tgz
@@ -97,7 +95,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 --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf
COPY conf/nginx.conf /etc/nginx/nginx.conf 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 COPY conf/dhparam /etc/nginx/dhparam
LABEL description="NGINX Docker built top of LibreSSL" \ LABEL description="NGINX Docker built top of LibreSSL" \

6
nginx/conf/nginx.conf
View File

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