Update to Nginx 1.15.12

Author: yrccondor

Dockerfile

@@ -2,7 +2,7 @@ FROM alpine:3.9
 
 LABEL maintainer="NGINX Docker Maintainers <docker-maint@nginx.com>"
 
-ENV NGINX_VERSION 1.15.11
+ENV NGINX_VERSION 1.15.12
 
 RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& CONFIG="\
@@ -68,7 +68,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 		gd-dev \
 		geoip-dev \
 		git \
-		patch \
 	&& curl -fSL https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz -o nginx.tar.gz \
 	&& curl -fSL https://nginx.org/download/nginx-$NGINX_VERSION.tar.gz.asc  -o nginx.tar.gz.asc \
 	&& curl -fSL https://www.openssl.org/source/openssl-1.1.1b.tar.gz -o openssl-1.1.1b.tar.gz \
@@ -92,10 +91,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& rm -f nginx.tar.gz \
 	&& rm -f openssl-1.1.1b.tar.gz \
 	&& cd /usr/src \
-	&& git clone https://github.com/hakasenyang/openssl-patch.git \
-	&& cd openssl-1.1.1b \
-	&& patch -p1 < ../openssl-patch/openssl-equal-1.1.1b_ciphers.patch \
-	&& cd /usr/src \
 	&& git clone https://github.com/google/ngx_brotli.git \
 	&& cd ngx_brotli \
 	&& git submodule update --init \
@@ -126,7 +121,6 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
 	&& rm -rf /usr/src/nginx-$NGINX_VERSION \
 	&& rm -rf /usr/src/openssl-1.1.1b \
 	&& rm -rf /usr/src/ngx_brotli \
-	&& rm -rf /usr/src/openssl-patch \
 	\
 	# Bring in gettext so we can get `envsubst`, then throw
 	# the rest away. To do this, we need to install `gettext`

README.md

@@ -9,7 +9,7 @@ Based on [nginxinc/docker-nginx](https://github.com/nginxinc/docker-nginx).
 To enable TLS 1.3, use:
 
 ```nginx
-ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
+ssl_protocols TLSv1.2 TLSv1.3;
 ssl_ciphers [TLS13+AESGCM+AES128|TLS13+AESGCM+AES256|TLS13+CHACHA20]:[EECDH+ECDSA+AESGCM+AES128|EECDH+ECDSA+CHACHA20]:EECDH+ECDSA+AESGCM+AES256:EECDH+ECDSA+AES128+SHA:EECDH+ECDSA+AES256+SHA:[EECDH+aRSA+AESGCM+AES128|EECDH+aRSA+CHACHA20]:EECDH+aRSA+AESGCM+AES256:EECDH+aRSA+AES128+SHA:EECDH+aRSA+AES256+SHA:RSA+AES128+SHA:RSA+AES256+SHA:RSA+3DES;
 ```
 To enable Brotli, use this in `http` block:
@@ -24,7 +24,7 @@ brotli_types *;
 
 ## Modification Details
 
-Compiled with patched OpenSSL 1.1.1b, supports TLS 1.3 draft 23, 26, 28 and final.
+Compiled with OpenSSL 1.1.1b, which supports TLS 1.3.
 
 Module [ngx_brotli](https://github.com/google/ngx_brotli) has been added for Brotli support.
 
@@ -33,5 +33,5 @@ Module [ngx_brotli](https://github.com/google/ngx_brotli) has been added for Bro
 ```bash
 git clone git://github.com/hackinit/docker-nginx.git
 cd docker-nginx
-docker build -t nginx:1.15.11-modified .
+docker build -t nginx:1.15.12-modified .
 ```