From d45c10ca6625a986bfce2f366ca46c7b3fc63bda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Roub=C3=AD=C4=8Dek?= Date: Wed, 23 Sep 2015 17:43:31 +0200 Subject: [PATCH 1/4] Use nginx 1.9.5 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0445b4d..cc80e08 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.9.2 +FROM nginx:1.9.5 MAINTAINER Jason Wilder jwilder@litl.com # Install wget and install/updates certificates From 249fb204f1c0fcf6f9f788448369e1b208649ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Roub=C3=AD=C4=8Dek?= Date: Wed, 23 Sep 2015 17:47:18 +0200 Subject: [PATCH 2/4] Use HTTP/2 instead of SPDY --- nginx.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.tmpl b/nginx.tmpl index 08f6c01..224d2b5 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -61,7 +61,7 @@ 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 spdy; + listen 443 ssl http2; return 503; ssl_certificate /etc/nginx/certs/default.crt; From e06d5917a2e6241b1f9c7ac1a7cdd7288a8702a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Roub=C3=AD=C4=8Dek?= Date: Wed, 23 Sep 2015 17:48:40 +0200 Subject: [PATCH 3/4] Use HTTP/2 instead of SPDY --- nginx.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nginx.tmpl b/nginx.tmpl index 224d2b5..788ca90 100644 --- a/nginx.tmpl +++ b/nginx.tmpl @@ -117,7 +117,7 @@ server { server { server_name {{ $host }}; - listen 443 ssl spdy {{ $default_server }}; + listen 443 ssl http2 {{ $default_server }}; access_log /var/log/nginx/access.log vhost; ssl_protocols TLSv1 TLSv1.1 TLSv1.2; @@ -185,7 +185,7 @@ server { {{ if (and (exists "/etc/nginx/certs/default.crt") (exists "/etc/nginx/certs/default.key")) }} server { server_name {{ $host }}; - listen 443 ssl spdy {{ $default_server }}; + listen 443 ssl http2 {{ $default_server }}; access_log /var/log/nginx/access.log vhost; return 503; From d46d9ad94394b28b52a33cf6fa79a7c37d218eb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Roub=C3=AD=C4=8Dek?= Date: Wed, 23 Sep 2015 17:49:51 +0200 Subject: [PATCH 4/4] Use nginx 1.9.5 badge in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b4b1df7..4053506 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![nginx 1.9.2](https://img.shields.io/badge/nginx-1.9.2-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) +![nginx 1.9.5](https://img.shields.io/badge/nginx-1.9.5-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) nginx-proxy sets up a container running nginx and [docker-gen][1]. docker-gen generates reverse proxy configs for nginx and reloads nginx when containers are started and stopped.