From 7b1b154e95f4c4d2f37d2388fc0d613bc10ef257 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Fri, 15 May 2026 22:13:12 +0800
Subject: [PATCH] upgraded nginx to 1.31.0

---
 .gitea/workflows/build-nginx.yaml | 14 ++++++++------
 nginx/Dockerfile                  |  7 +++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/build-nginx.yaml b/.gitea/workflows/build-nginx.yaml
index a724dac..f9e7601 100644
--- a/.gitea/workflows/build-nginx.yaml
+++ b/.gitea/workflows/build-nginx.yaml
@@ -31,12 +31,13 @@ jobs:
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
             "gitea.woggioni.net/woggioni/nginx:latest"
-            "gitea.woggioni.net/woggioni/nginx:v1.30.0"
+            "gitea.woggioni.net/woggioni/nginx:v1.31.0"
           secrets: |
             GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
           build-args: |
-            LIBRESSL_VERSION=4.2.1
-            NGINX_VERSION=1.30.0
+            LIBRESSL_VERSION=4.3.1
+            NGINX_VERSION=1.31.0
+            NJS_VERSION=0.9.8
             NGINX_BRANCH=vanilla
       -
         name: Build and push nginx custom images
@@ -53,10 +54,11 @@ jobs:
           ssh: default=/home/luser/.ssh/id_ed25519
           tags: |
             "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: |
             GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
           build-args: |
-            LIBRESSL_VERSION=4.2.1
-            NGINX_VERSION=1.30.0
+            LIBRESSL_VERSION=4.3.1
+            NGINX_VERSION=1.31.0
+            NJS_VERSION=0.9.8
             NGINX_BRANCH=woggioni
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 0f23cfd..15791ab 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -2,7 +2,7 @@ ARG NGINX_BRANCH=vanilla
 FROM alpine:3.23 AS base
 
 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 add \
 	autoconf \
@@ -34,8 +34,7 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
 	tar \
 	tzdata \
 	zlib \
-	zlib-dev \
-	mercurial
+	zlib-dev
 RUN adduser -D luser
 USER luser
 WORKDIR /home/luser
@@ -69,7 +68,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli
 
 USER root
 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
 USER luser
 WORKDIR /home/luser