thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-02-24 09:48:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2261 from nginx-proxy/dependabot/docker/nginx-1.25.1-alpine

Browse Source 
build: bump nginx from 1.25.0-alpine to 1.25.1-alpine
This commit is contained in:
Nicolas Duchon 2023-07-04 08:04:14 +02:00 committed by GitHub
commit f2be3c3915
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -3,7 +3,7 @@ FROM nginxproxy/docker-gen:0.10.4-debian AS docker-gen
FROM nginxproxy/forego:0.17.1-debian AS forego FROM nginxproxy/forego:0.17.1-debian AS forego
# Build the final image # Build the final image
FROM nginx:1.25.0 FROM nginx:1.25.1
ARG NGINX_PROXY_VERSION ARG NGINX_PROXY_VERSION
# Add DOCKER_GEN_VERSION environment variable because # Add DOCKER_GEN_VERSION environment variable because

2
Dockerfile.alpine
View File

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

10
nginx.tmpl
View File

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