From 976eebe892b03312158df81840f59b73c2c0436c Mon Sep 17 00:00:00 2001 From: "nicolas.dorier" Date: Tue, 12 Dec 2023 14:30:32 +0900 Subject: [PATCH] bump nginx --- Production/nginx.tmpl | 15 +++++++++------ README.md | 2 +- contrib/build-all-images.sh | 4 ++-- .../docker-fragments/nginx.yml | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/Production/nginx.tmpl b/Production/nginx.tmpl index 2be489a..fecbdf2 100644 --- a/Production/nginx.tmpl +++ b/Production/nginx.tmpl @@ -358,10 +358,11 @@ server { {{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} server { server_name _; # This is just an invalid value which will never trigger on a real hostname. - listen 443 ssl http2; + listen 443 ssl; {{ if $enable_ipv6 }} - listen [::]:443 ssl http2; + listen [::]:443 ssl; {{ end }} + http2 on; access_log /var/log/nginx/access.log vhost; return 503; @@ -503,10 +504,11 @@ server { proxy_set_header X-Forwarded-Port $proxy_x_forwarded_port; client_max_body_size 100M; server_name {{ $host }}; - listen 443 ssl http2 {{ $default_server }}; + listen 443 ssl {{ $default_server }}; {{ if $enable_ipv6 }} - listen [::]:443 ssl http2 {{ $default_server }}; + listen [::]:443 ssl {{ $default_server }}; {{ end }} + http2 on; access_log /var/log/nginx/access.log vhost; {{ if eq $network_tag "internal" }} @@ -648,10 +650,11 @@ server { server { client_max_body_size 100M; server_name {{ $host }}; - listen 443 ssl http2 {{ $default_server }}; + listen 443 ssl {{ $default_server }}; {{ if $enable_ipv6 }} - listen [::]:443 ssl http2 {{ $default_server }}; + listen [::]:443 ssl {{ $default_server }}; {{ end }} + http2 on; access_log /var/log/nginx/access.log vhost; {{/* Enable usage of self-signed SSL certificate if .local hostname */}} {{ if hasSuffix "local" $host }} diff --git a/README.md b/README.md index 9569808..76c8724 100644 --- a/README.md +++ b/README.md @@ -351,7 +351,7 @@ Note that BTCPayServer developers will not spend excessive time testing your ima | btcpayserver/monero | 0.18.3.1 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.1/Monero/0.18.3.1/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.1/Monero/0.18.3.1/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Monero/0.18.3.1/Monero/0.18.3.1/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/monero) | | nicolasdorier/nbxplorer | 2.4.2 | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.2/Dockerfile.linuxamd64) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.2/Dockerfile.linuxarm32v7) | [✔️](https://raw.githubusercontent.com/dgarage/nbxplorer/v2.4.2/Dockerfile.linuxarm64v8) | [Github](https://github.com/dgarage/nbxplorer) - [DockerHub](https://hub.docker.com/r/nicolasdorier/nbxplorer) | | btcpayserver/letsencrypt-nginx-proxy-companion | 1.12.2 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion/v1.12.2/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-letsencrypt-nginx-proxy-companion) - [DockerHub](https://hub.docker.com/r/btcpayserver/letsencrypt-nginx-proxy-companion) | -| nginx | 1.23.3 | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | +| nginx | 1.25.3-bookworm | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [✔️](https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile) | [Github](https://github.com/nginxinc/docker-nginx) - [DockerHub](https://hub.docker.com/_/nginx) | | btcpayserver/docker-gen | 0.7.8 | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/docker-gen/v0.7.8/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/docker-gen) - [DockerHub](https://hub.docker.com/r/btcpayserver/docker-gen) | | btcpayserver/btctransmuter | 0.0.59 | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/amd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/btctransmuter/v0.0.59/Dockerfiles/arm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/btctransmuter) - [DockerHub](https://hub.docker.com/r/btcpayserver/btctransmuter) | | btcpayserver/cloudflared | 2023.7.3 | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2023.7.3/Cloudflared/2023.7.3/linuxamd64.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2023.7.3/Cloudflared/2023.7.3/linuxarm32v7.Dockerfile) | [✔️](https://raw.githubusercontent.com/btcpayserver/dockerfile-deps/Cloudflared/2023.7.3/Cloudflared/2023.7.3/linuxarm64v8.Dockerfile) | [Github](https://github.com/btcpayserver/dockerfile-deps) - [DockerHub](https://hub.docker.com/r/btcpayserver/cloudflared) | diff --git a/contrib/build-all-images.sh b/contrib/build-all-images.sh index 7ef5143..9f00cde 100644 --- a/contrib/build-all-images.sh +++ b/contrib/build-all-images.sh @@ -454,12 +454,12 @@ DOCKERFILE="stable/debian/Dockerfile" [[ "$(uname -m)" == "armv7l" ]] && DOCKERFILE="stable/debian/Dockerfile" # https://raw.githubusercontent.com/nginxinc/docker-nginx/1.23.2/stable/debian/Dockerfile [[ "$(uname -m)" == "aarch64" ]] && DOCKERFILE="stable/debian/Dockerfile" -echo "Building nginx:1.23.3" +echo "Building nginx:1.25.3-bookworm" git clone https://github.com/nginxinc/docker-nginx nginx cd nginx git checkout 1.23.2 cd "$(dirname $DOCKERFILE)" -docker build -f "$DOCKERFILE" -t "nginx:1.23.3" . +docker build -f "$DOCKERFILE" -t "nginx:1.25.3-bookworm" . cd - && cd .. diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml index 25b301f..746724b 100644 --- a/docker-compose-generator/docker-fragments/nginx.yml +++ b/docker-compose-generator/docker-fragments/nginx.yml @@ -3,7 +3,7 @@ version: "3" services: nginx: restart: unless-stopped - image: nginx:1.23.3 + image: nginx:1.25.3-bookworm container_name: nginx ports: - "${REVERSEPROXY_HTTP_PORT:-80}:80"