thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-25 05:16:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1313 from JIAZHEN/master

Browse Source 
Upgrade nginx to 1.17
This commit is contained in:
Jason Wilder 2019-08-08 08:26:11 -06:00 committed by GitHub
commit eb3613695c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

2
Dockerfile.alpine
View File

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

2
test/test_ssl/test_dhparam.py
View File

@ -90,4 +90,4 @@ def test_web5_dhparam_is_used(docker_compose):
host = "%s:443" % sut_container.attrs["NetworkSettings"]["IPAddress"] host = "%s:443" % sut_container.attrs["NetworkSettings"]["IPAddress"]
r = subprocess.check_output( r = subprocess.check_output(
"echo '' | openssl s_client -connect %s -cipher 'EDH' | grep 'Server Temp Key'" % host, shell=True) "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