Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 39bc98adfc into a285717657

Browse source
This commit is contained in:
Matthias Döring 2018-07-24 22:12:03 +00:00 committed by GitHub
commit b26d2986b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nginx.tmpl
View file

@ -19,7 +19,7 @@
server 127.0.0.1 down; server 127.0.0.1 down;
{{ end }} {{ end }}
{{ end }} {{ end }}
{{ end }} {{ end }}
# If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the # If we receive X-Forwarded-Proto, pass it through; otherwise, pass along the

4
test/test_DOCKER_HOST_unix_socket.py
View file

@ -6,10 +6,10 @@ def test_unknown_virtual_host(docker_compose, nginxproxy):
def test_forwards_to_web1(docker_compose, nginxproxy): def test_forwards_to_web1(docker_compose, nginxproxy):
r = nginxproxy.get("http://web1.nginx-proxy.tld/port") r = nginxproxy.get("http://web1.nginx-proxy.tld/port")
assert r.status_code == 200 assert r.status_code == 200
assert r.text == "answer from port 81\n" assert r.text == "answer from port 81\n"
def test_forwards_to_web2(docker_compose, nginxproxy): def test_forwards_to_web2(docker_compose, nginxproxy):
r = nginxproxy.get("http://web2.nginx-proxy.tld/port") r = nginxproxy.get("http://web2.nginx-proxy.tld/port")
assert r.status_code == 200 assert r.status_code == 200
assert r.text == "answer from port 82\n" assert r.text == "answer from port 82\n"

4
test/test_nominal.py
View file

@ -9,14 +9,14 @@ def test_unknown_virtual_host(docker_compose, nginxproxy):
def test_forwards_to_web1(docker_compose, nginxproxy): def test_forwards_to_web1(docker_compose, nginxproxy):
r = nginxproxy.get("http://web1.nginx-proxy.tld/port") r = nginxproxy.get("http://web1.nginx-proxy.tld/port")
assert r.status_code == 200 assert r.status_code == 200
assert r.text == "answer from port 81\n" assert r.text == "answer from port 81\n"
def test_forwards_to_web2(docker_compose, nginxproxy): def test_forwards_to_web2(docker_compose, nginxproxy):
r = nginxproxy.get("http://web2.nginx-proxy.tld/port") r = nginxproxy.get("http://web2.nginx-proxy.tld/port")
assert r.status_code == 200 assert r.status_code == 200
assert r.text == "answer from port 82\n" assert r.text == "answer from port 82\n"
def test_ipv6_is_disabled_by_default(docker_compose, nginxproxy): def test_ipv6_is_disabled_by_default(docker_compose, nginxproxy):