From 3abb9c377c4431b6707e5fefe51f77d84dd5c31e Mon Sep 17 00:00:00 2001 From: Nicolas Dorier Date: Fri, 16 Oct 2026 15:23:53 +0900 Subject: [PATCH] Bump Nginx to 1.31.7 --- contrib/DockerFileBuildHelper/Program.cs | 2 +- contrib/build-all-images.sh | 16 ++++++++-------- .../docker-fragments/nginx.yml | 2 +- docs/supported-images.md | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contrib/DockerFileBuildHelper/Program.cs b/contrib/DockerFileBuildHelper/Program.cs index 252caf0a3..ca3bcfea2 100644 --- a/contrib/DockerFileBuildHelper/Program.cs +++ b/contrib/DockerFileBuildHelper/Program.cs @@ -501,7 +501,7 @@ private DockerInfo GetDockerInfo(Image image) dockerInfo.DockerFilePathARM32v7 = $"mainline/debian/Dockerfile"; dockerInfo.DockerFilePathARM64v8 = $"mainline/debian/Dockerfile"; dockerInfo.GitLink = "https://github.com/nginx/docker-nginx"; - dockerInfo.GitRef = "a16f1329e13e7273c4103f75d863ca625b75109e"; + dockerInfo.GitRef = "4b9f658be76820b24e4ef4605413a5c08707a512"; dockerInfo.SupportedByUs = true; break; case "docker-gen": diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 7fe1e2be5..d0f5f0879 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -343,18 +343,18 @@ cd - && cd .. # Build nginx -# https://raw.githubusercontent.com/nginx/docker-nginx/a16f1329e13e7273c4103f75d863ca625b75109e/mainline/debian/Dockerfile +# https://raw.githubusercontent.com/nginx/docker-nginx/4b9f658be76820b24e4ef4605413a5c08707a512/mainline/debian/Dockerfile DOCKERFILE="mainline/debian/Dockerfile" -# https://raw.githubusercontent.com/nginx/docker-nginx/a16f1329e13e7273c4103f75d863ca625b75109e/mainline/debian/Dockerfile +# https://raw.githubusercontent.com/nginx/docker-nginx/4b9f658be76820b24e4ef4605413a5c08707a512/mainline/debian/Dockerfile [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="mainline/debian/Dockerfile" -# https://raw.githubusercontent.com/nginx/docker-nginx/a16f1329e13e7273c4103f75d863ca625b75109e/mainline/debian/Dockerfile +# https://raw.githubusercontent.com/nginx/docker-nginx/4b9f658be76820b24e4ef4605413a5c08707a512/mainline/debian/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="mainline/debian/Dockerfile" -echo "Building nginx:1.31.6-trixie" +echo "Building nginx:1.31.7-trixie" git clone https://github.com/nginx/docker-nginx nginx cd nginx -git checkout a16f1329e13e7273c4103f75d863ca625b75109e +git checkout 4b9f658be76820b24e4ef4605413a5c08707a512 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nginx:1.31.6-trixie" . +docker build -f "$DOCKERFILE" -t "nginx:1.31.7-trixie" . cd - && cd .. @@ -461,12 +461,12 @@ DOCKERFILE="Dockerfile" # https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.17.6/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="Dockerfile" if [[ "$DOCKERFILE" ]]; then - echo "Building lightninglabs/lightning-terminal:v0.17.6-path-prefix" + echo "Building lightninglabs/lightning-terminal:v0.17.6" git clone https://github.com/lightninglabs/lightning-terminal lightning-terminal cd lightning-terminal git checkout v0.17.6 cd "$(dirname $DOCKERFILE)" - docker build --build-arg public_url=/lit/ -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.17.6-path-prefix" . + docker build -f "$DOCKERFILE" -t "lightninglabs/lightning-terminal:v0.17.6" . cd - && cd .. fi diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index 900af671b..1b8c01f2b 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -1,7 +1,7 @@ services: nginx: restart: unless-stopped - image: nginx:1.31.6-trixie + image: nginx:1.31.7-trixie command: ["nginx", "-g", "daemon off; worker_shutdown_timeout 5s;"] logging: driver: local diff --git a/docs/supported-images.md b/docs/supported-images.md index 9b6492c86..68c4ac10f 100644 --- a/docs/supported-images.md +++ b/docs/supported-images.md @@ -20,7 +20,7 @@ manually. | btcpayserver/monero | 0.18.5.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.5.3/Monero/0.18.5.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.5.3/Monero/0.18.5.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.5.3/Monero/0.18.5.3/Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | nicolasdorier/nbxplorer | 2.6.19 | [✔️](https://raw.githubusercontent.com/btcpayserver/nbxplorer/v2.6.19/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/nbxplorer/v2.6.19/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/nbxplorer/v2.6.19/Dockerfile) | [Github](https://github.com/btcpayserver/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 2.2.9-2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v2.2.9-2/Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | -| nginx | 1.31.6-trixie | [✔️](https://raw.githubusercontent.com/nginx/docker-nginx/a16f1329e13e7273c4103f75d863ca625b75109e/mainline/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginx/docker-nginx/a16f1329e13e7273c4103f75d863ca625b75109e/mainline/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginx/docker-nginx/a16f1329e13e7273c4103f75d863ca625b75109e/mainline/debian/Dockerfile) | [Github](https://github.com/nginx/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | +| nginx | 1.31.7-trixie | [✔️](https://raw.githubusercontent.com/nginx/docker-nginx/4b9f658be76820b24e4ef4605413a5c08707a512/mainline/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginx/docker-nginx/4b9f658be76820b24e4ef4605413a5c08707a512/mainline/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginx/docker-nginx/4b9f658be76820b24e4ef4605413a5c08707a512/mainline/debian/Dockerfile) | [Github](https://github.com/nginx/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.10.7 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/0.10.7/Dockerfile.alpine) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/cloudflared | 2026.9.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2026.9.3/Cloudflared/2026.9.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2026.9.3/Cloudflared/2026.9.3/Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2026.9.3/Cloudflared/2026.9.3/Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/cloudflared) | | pihole/pihole | 2026.09.0 | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2026.09.0/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2026.09.0/src/Dockerfile) | [✔️](https://raw.githubusercontent.com/pi-hole/docker-pi-hole/2026.09.0/src/Dockerfile) | [Github](https://github.com/pi-hole/docker-pi-hole) - [DockerHub](https://hub.docker.com/r/pihole/pihole) | @@ -44,7 +44,7 @@ manually. | redis | 5.0.2-alpine | [✔️](https://raw.githubusercontent.com/docker-library/redis/f1a8498333ae3ab340b5b39fbac1d7e1dc0d628c/5.0/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/docker-library/redis) - [DockerHub](https://hub.docker.com/_/redis) | | lukechilds/electrumx | latest | [✔️](https://raw.githubusercontent.com/lukechilds/docker-electrumx/master/Dockerfile) | ️❌ | ️❌ | [Github](https://github.com/lukechilds/docker-electrumx) - [DockerHub](https://hub.docker.com/r/lukechilds/electrumx) | | podcastindexorg/podcasting20-helipad | v0.1.10 | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.10/umbrel/Dockerfile) | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.10/umbrel/Dockerfile) | [✔️](https://raw.githubusercontent.com/Podcastindex-org/helipad/v0.1.10/umbrel/Dockerfile) | [Github](https://github.com/Podcastindex-org/helipad) - [DockerHub](https://hub.docker.com/r/podcastindexorg/podcasting20-helipad) | -| lightninglabs/lightning-terminal | v0.17.6-path-prefix | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.17.6/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.17.6/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | +| lightninglabs/lightning-terminal | v0.17.6 | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.17.6/Dockerfile) | ️❌ | [✔️](https://raw.githubusercontent.com/lightninglabs/lightning-terminal/v0.17.6/Dockerfile) | [Github](https://github.com/lightninglabs/lightning-terminal) - [DockerHub](https://hub.docker.com/r/lightninglabs/lightning-terminal) | | hectorchu1/mwebd | latest | [✔️](https://raw.githubusercontent.com/ltcmweb/btcpayserver-ltcmweb-plugin/main/Dockerfile) | [✔️](https://raw.githubusercontent.com/ltcmweb/btcpayserver-ltcmweb-plugin/main/Dockerfile) | [✔️](https://raw.githubusercontent.com/ltcmweb/btcpayserver-ltcmweb-plugin/main/Dockerfile) | [Github](https://github.com/ltcmweb/btcpayserver-ltcmweb-plugin) - [DockerHub](https://hub.docker.com/r/hectorchu1/mwebd) | | mempool/frontend | v2.5.0 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/frontend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/frontend) | | mempool/backend | v2.5.0 | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [✔️](https://raw.githubusercontent.com/mempool/mempool/v2.5.0/docker/backend/Dockerfile) | [Github](https://github.com/mempool/mempool) - [DockerHub](https://hub.docker.com/r/mempool/backend) |