Merge pull request #1313 from JIAZHEN/master

Upgrade nginx to 1.17

Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.14.1
+FROM nginx:1.17.2
 LABEL maintainer="Jason Wilder mail@jasonwilder.com"
 
 # Install wget and install/updates certificates

Dockerfile.alpine

@@ -1,4 +1,4 @@
-FROM nginx:1.14.1-alpine
+FROM nginx:1.17.2-alpine
 LABEL maintainer="Jason Wilder mail@jasonwilder.com"
 
 # Install wget and install/updates certificates

test/test_ssl/test_dhparam.py

@@ -90,4 +90,4 @@ def test_web5_dhparam_is_used(docker_compose):
     host = "%s:443" % sut_container.attrs["NetworkSettings"]["IPAddress"]
     r = subprocess.check_output(
         "echo '' | openssl s_client -connect %s -cipher 'EDH' | grep 'Server Temp Key'" % host, shell=True)
-    assert "Server Temp Key: DH, 2048 bits\n" == r
+    assert "Server Temp Key: X25519, 253 bits\n" == r