From aaefd685c04778f5de6d6abb8618e00d2182d441 Mon Sep 17 00:00:00 2001 From: Walter Oggioni Date: Thu, 14 Aug 2025 20:06:40 +0800 Subject: [PATCH] updated nginx to 1.29.1 --- .gitea/workflows/build-nginx.yaml | 4 ++-- nginx/Dockerfile | 8 +------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build-nginx.yaml b/.gitea/workflows/build-nginx.yaml index 11e4d1e..7b33dc8 100644 --- a/.gitea/workflows/build-nginx.yaml +++ b/.gitea/workflows/build-nginx.yaml @@ -36,10 +36,10 @@ jobs: pull: true tags: | "gitea.woggioni.net/woggioni/nginx:latest" - "gitea.woggioni.net/woggioni/nginx:v1.29.0" + "gitea.woggioni.net/woggioni/nginx:v1.29.1" secrets: | GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }} - build-args: "NGINX_VERSION=1.29.0" + build-args: "NGINX_VERSION=1.29.1" cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx diff --git a/nginx/Dockerfile b/nginx/Dockerfile index e7b30f8..2b703b9 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:latest AS base FROM alpine:latest AS build -ARG NGINX_VERSION LIBRESSL_VERSION=4.0.0 +ARG NGINX_VERSION LIBRESSL_VERSION=4.1.0 ENV NGINX_VERSION=${NGINX_VERSION} RUN --mount=type=cache,target=/var/cache/apk apk update RUN --mount=type=cache,target=/var/cache/apk apk add \ @@ -40,12 +40,6 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \ RUN adduser -D luser USER luser WORKDIR /home/luser -# ADD --chown=luser:luser https://boringssl.googlesource.com/boringssl.git boringssl -# RUN grep -qxF 'SET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)' boringssl/crypto/CMakeLists.txt || echo -e '\nSET_TARGET_PROPERTIES(crypto PROPERTIES SOVERSION 1)' >> boringssl/crypto/CMakeLists.txt -# RUN grep -qxF 'SET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)' boringssl/ssl/CMakeLists.txt || echo -e '\nSET_TARGET_PROPERTIES(ssl PROPERTIES SOVERSION 1)' >> boringssl/ssl/CMakeLists.txt -# RUN mkdir -p boringssl/build -# RUN cmake -G Ninja -B boringssl/build -S boringssl -DCMAKE_BUILD_TYPE=Release -# RUN cmake --build boringssl/build #RUN git clone --depth 1 --branch v4.0.0 https://github.com/libressl/portable.git libressl ADD --chown=luser:luser https://cdn.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${LIBRESSL_VERSION}.tar.gz libressl.tgz