Merge pull request #2261 from nginx-proxy/dependabot/docker/nginx-1.2…

…5.1-alpine build: bump nginx from 1.25.0-alpine to 1.25.1-alpine
nginx-proxy · Jul 4, 2023 · f2be3c3 · f2be3c3
2 parents 104d3fc + 45c181b
commit f2be3c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ FROM nginxproxy/docker-gen:0.10.4-debian AS docker-gen
 FROM nginxproxy/forego:0.17.1-debian AS forego
 
 # Build the final image
-FROM nginx:1.25.0
+FROM nginx:1.25.1
 
 ARG NGINX_PROXY_VERSION
 # Add DOCKER_GEN_VERSION environment variable because 

diff --git a/Dockerfile.alpine b/Dockerfile.alpine
@@ -3,7 +3,7 @@ FROM nginxproxy/docker-gen:0.10.4 AS docker-gen
 FROM nginxproxy/forego:0.17.1 AS forego
 
 # Build the final image
-FROM nginx:1.25.0-alpine
+FROM nginx:1.25.1-alpine
 
 ARG NGINX_PROXY_VERSION
 # Add DOCKER_GEN_VERSION environment variable because 

diff --git a/nginx.tmpl b/nginx.tmpl
@@ -429,16 +429,17 @@ proxy_set_header Proxy "";
 server {
     server_name _; # This is just an invalid value which will never trigger on a real hostname.
     server_tokens off;
+    http2 on;
         {{- if $fallback_http }}
     listen {{ $globals.external_http_port }}; {{- /* Do not add `default_server` (see comment above). */}}
                 {{- if $globals.enable_ipv6 }}
     listen [::]:{{ $globals.external_http_port }}; {{- /* Do not add `default_server` (see comment above). */}}
                 {{- end }}
         {{- end }}
         {{- if $fallback_https }}
-    listen {{ $globals.external_https_port }} ssl http2; {{- /* Do not add `default_server` (see comment above). */}}
+    listen {{ $globals.external_https_port }} ssl; {{- /* Do not add `default_server` (see comment above). */}}
             {{- if $globals.enable_ipv6 }}
-    listen [::]:{{ $globals.external_https_port }} ssl http2; {{- /* Do not add `default_server` (see comment above). */}}
+    listen [::]:{{ $globals.external_https_port }} ssl; {{- /* Do not add `default_server` (see comment above). */}}
             {{- end }}
     ssl_session_cache shared:SSL:50m;
     ssl_session_tickets off;
@@ -548,6 +549,7 @@ server {
     {{- if $server_tokens }}
     server_tokens {{ $server_tokens }};
     {{- end }}
+    http2 on;
     {{ $globals.access_log }}
     {{- if or (eq $https_method "nohttps") (not $cert_ok) (eq $https_method "noredirect") }}
     listen {{ $globals.external_http_port }} {{ $default_server }};
@@ -556,9 +558,9 @@ server {
         {{- end }}
     {{- end }}
     {{- if ne $https_method "nohttps" }}
-    listen {{ $globals.external_https_port }} ssl http2 {{ $default_server }};
+    listen {{ $globals.external_https_port }} ssl {{ $default_server }};
         {{- if $globals.enable_ipv6 }}
-    listen [::]:{{ $globals.external_https_port }} ssl http2 {{ $default_server }};
+    listen [::]:{{ $globals.external_https_port }} ssl {{ $default_server }};
         {{- end }}
 
         {{- if $cert_ok }}