From 98b5828f837522e412ee6f2c341d5f31f1e65c35 Mon Sep 17 00:00:00 2001 From: Steve Kamerman Date: Tue, 7 Mar 2017 14:04:44 -0500 Subject: [PATCH] Modified tests to include dhparams --- .gitignore | 1 + generate-dhparam.sh | 1 + .../Dockerfile-nginx-proxy-tester | 7 +- test/ssl_dhparam.bats | 90 ------------------- test/test_DOCKER_HOST_unix_socket.yml | 6 +- test/test_composev2.yml | 5 +- test/test_custom/test_defaults-location.yml | 9 +- test/test_custom/test_defaults.yml | 7 +- test/test_custom/test_location-per-vhost.yml | 7 +- test/test_custom/test_per-vhost.yml | 7 +- test/test_custom/test_proxy-wide.yml | 7 +- test/test_default-host.yml | 1 + test/test_dockergen/test_dockergen_v2.yml | 3 +- test/test_dockergen/test_dockergen_v3.py | 5 +- test/test_dockergen/test_dockergen_v3.yml | 3 +- test/test_events.yml | 1 + test/test_headers/test_http.yml | 3 +- test/test_headers/test_https.yml | 1 + test/test_ipv6.yml | 5 +- test/test_multiple-hosts.yml | 1 + test/test_multiple-networks.yml | 7 +- .../test_multiple-ports/test_VIRTUAL_PORT.yml | 1 + test/test_multiple-ports/test_default-80.yml | 1 + .../test_single-port-not-80.yml | 3 +- test/test_nominal.yml | 5 +- test/test_ssl/test_nohttp.yml | 1 + test/test_ssl/test_nohttps.yml | 3 +- test/test_ssl/test_noredirect.yml | 1 + test/test_ssl/test_wildcard.yml | 1 + test/test_wildcard_host.yml | 3 +- 30 files changed, 69 insertions(+), 127 deletions(-) delete mode 100644 test/ssl_dhparam.bats diff --git a/.gitignore b/.gitignore index 0b3700d..5daab4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ **/__pycache__/ **/.cache/ +.idea/ diff --git a/generate-dhparam.sh b/generate-dhparam.sh index 9f5d4ff..3fdc77c 100755 --- a/generate-dhparam.sh +++ b/generate-dhparam.sh @@ -15,6 +15,7 @@ if [[ -f $DHPARAM_FILE ]]; then CURRENT_HASH=$(md5sum $DHPARAM_FILE | cut -d" " -f1) if [[ $PREGEN_HASH != $CURRENT_HASH ]]; then # There is already a dhparam, and it's not the default + echo "Custom dhparam.pem file found, generation skipped" exit 0 fi diff --git a/test/requirements/Dockerfile-nginx-proxy-tester b/test/requirements/Dockerfile-nginx-proxy-tester index b403ed7..27d0538 100644 --- a/test/requirements/Dockerfile-nginx-proxy-tester +++ b/test/requirements/Dockerfile-nginx-proxy-tester @@ -1,5 +1,10 @@ -FROM python:2.7 +FROM python:2.7-alpine + +# Note: we're using alpine because it has openssl 1.0.2, which we need for testing +RUN apk add --update bash openssl curl && rm -rf /var/cache/apk/* + COPY python-requirements.txt /requirements.txt RUN pip install -r /requirements.txt + WORKDIR /test ENTRYPOINT ["pytest"] diff --git a/test/ssl_dhparam.bats b/test/ssl_dhparam.bats deleted file mode 100644 index 2ca8a08..0000000 --- a/test/ssl_dhparam.bats +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env bats -load test_helpers - -function setup { - # make sure to stop any web container before each test so we don't - # have any unexpected contaiener running with VIRTUAL_HOST or VIRUTAL_PORT set - stop_bats_containers web -} - -@test "[$TEST_FILE] test dhparam.pem is generated if missing" { - SUT_CONTAINER=bats-nginx-proxy-${TEST_FILE}-1 - - # WHEN - run docker_clean $SUT_CONTAINER \ - && docker run -d \ - --label bats-type="nginx-proxy" \ - --name $SUT_CONTAINER \ - -v /var/run/docker.sock:/tmp/docker.sock:ro \ - -e DHPARAM_BITS=256 \ - $SUT_IMAGE \ - && wait_for_nginxproxy_container_to_start $SUT_CONTAINER \ - && docker logs $SUT_CONTAINER - - DEFAULT_HASH=$(docker exec $SUT_CONTAINER md5sum /app/dhparam.pem.default | cut -d" " -f1) - - assert_success - docker_wait_for_log $SUT_CONTAINER 30 "Generating DH parameters" - - # THEN - docker_wait_for_log $SUT_CONTAINER 240 "dhparam generation complete, reloading nginx" - - run docker exec $SUT_CONTAINER su -c "md5sum /etc/nginx/dhparam/dhparam.pem" - - refute_output -p $DEFAULT_HASH -} - -@test "[$TEST_FILE] test dhparam.pem is generated if default one is present" { - SUT_CONTAINER=bats-nginx-proxy-${TEST_FILE}-2 - - # Copy the default dhparams to a volume and mount it in to ensure it's regenerated - TMP_DIR=/tmp/nginx-proxy-bats - if [ ! -d $TMP_DIR ]; then - mkdir $TMP_DIR - fi - - # If the previous test crashed, a dhparam is left that only root can delete, so we - # delete it from within a container as root - if [ -f $TMP_DIR/dhparam.pem ]; then - docker run --rm -v $TMP_DIR:/opt busybox rm /opt/dhparam.pem - fi - - cp $DIR/../dhparam.pem.default $TMP_DIR/dhparam.pem - - # WHEN - run docker_clean $SUT_CONTAINER \ - && docker run -d \ - --label bats-type="nginx-proxy" \ - --name $SUT_CONTAINER \ - -v /var/run/docker.sock:/tmp/docker.sock:ro \ - -v $TMP_DIR:/etc/nginx/dhparam \ - -e DHPARAM_BITS=256 \ - $SUT_IMAGE \ - && wait_for_nginxproxy_container_to_start $SUT_CONTAINER \ - && docker logs $SUT_CONTAINER - - # THEN - assert_success - docker_wait_for_log $SUT_CONTAINER 30 "Generating DH parameters" - - docker exec $SUT_CONTAINER rm -rf /etc/nginx/dhparam/* -} - -@test "[$TEST_FILE] test dhparam.pem is not generated if custom one is present" { - SUT_CONTAINER=bats-nginx-proxy-${TEST_FILE}-3 - - # WHEN - run nginxproxy $SUT_CONTAINER -v /var/run/docker.sock:/tmp/docker.sock:ro - assert_success - docker_wait_for_log $SUT_CONTAINER 9 "Watching docker events" - - sleep 3 - run docker logs $SUT_CONTAINER - - # THEN - refute_output -p "Generating DH parameters" -} - -@test "[$TEST_FILE] stop all bats containers" { - stop_bats_containers -} diff --git a/test/test_DOCKER_HOST_unix_socket.yml b/test/test_DOCKER_HOST_unix_socket.yml index 79b4baf..dff75a8 100644 --- a/test/test_DOCKER_HOST_unix_socket.yml +++ b/test/test_DOCKER_HOST_unix_socket.yml @@ -1,5 +1,5 @@ web1: - image: web + image: web expose: - "81" environment: @@ -8,7 +8,7 @@ web1: web2: image: web - expose: + expose: - "82" environment: WEB_PORTS: 82 @@ -19,6 +19,6 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/f00.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro environment: DOCKER_HOST: unix:///f00.sock - diff --git a/test/test_composev2.yml b/test/test_composev2.yml index 5ffaf57..ef4df8d 100644 --- a/test/test_composev2.yml +++ b/test/test_composev2.yml @@ -4,11 +4,12 @@ services: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro web: - image: web + image: web expose: - "81" environment: WEB_PORTS: 81 - VIRTUAL_HOST: web.nginx-proxy.local \ No newline at end of file + VIRTUAL_HOST: web.nginx-proxy.local diff --git a/test/test_custom/test_defaults-location.yml b/test/test_custom/test_defaults-location.yml index d2ac14a..a5b0c44 100644 --- a/test/test_custom/test_defaults-location.yml +++ b/test/test_custom/test_defaults-location.yml @@ -2,11 +2,12 @@ nginx-proxy: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./my_custom_proxy_settings.conf:/etc/nginx/vhost.d/default_location:ro - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/web3.nginx-proxy.local_location:ro web1: - image: web + image: web expose: - "81" environment: @@ -14,7 +15,7 @@ web1: VIRTUAL_HOST: web1.nginx-proxy.local web2: - image: web + image: web expose: - "82" environment: @@ -22,9 +23,9 @@ web2: VIRTUAL_HOST: web2.nginx-proxy.local web3: - image: web + image: web expose: - "83" environment: WEB_PORTS: 83 - VIRTUAL_HOST: web3.nginx-proxy.local \ No newline at end of file + VIRTUAL_HOST: web3.nginx-proxy.local diff --git a/test/test_custom/test_defaults.yml b/test/test_custom/test_defaults.yml index 2b2f1bb..2cfddf0 100644 --- a/test/test_custom/test_defaults.yml +++ b/test/test_custom/test_defaults.yml @@ -4,10 +4,11 @@ services: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./my_custom_proxy_settings.conf:/etc/nginx/proxy.conf:ro web1: - image: web + image: web expose: - "81" environment: @@ -15,9 +16,9 @@ services: VIRTUAL_HOST: web1.nginx-proxy.local web2: - image: web + image: web expose: - "82" environment: WEB_PORTS: 82 - VIRTUAL_HOST: web2.nginx-proxy.local \ No newline at end of file + VIRTUAL_HOST: web2.nginx-proxy.local diff --git a/test/test_custom/test_location-per-vhost.yml b/test/test_custom/test_location-per-vhost.yml index 7ec9992..988181c 100644 --- a/test/test_custom/test_location-per-vhost.yml +++ b/test/test_custom/test_location-per-vhost.yml @@ -4,10 +4,11 @@ services: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./my_custom_proxy_settings.conf:/etc/nginx/vhost.d/web1.nginx-proxy.local_location:ro web1: - image: web + image: web expose: - "81" environment: @@ -15,9 +16,9 @@ services: VIRTUAL_HOST: web1.nginx-proxy.local web2: - image: web + image: web expose: - "82" environment: WEB_PORTS: 82 - VIRTUAL_HOST: web2.nginx-proxy.local \ No newline at end of file + VIRTUAL_HOST: web2.nginx-proxy.local diff --git a/test/test_custom/test_per-vhost.yml b/test/test_custom/test_per-vhost.yml index a99da1d..61ae02b 100644 --- a/test/test_custom/test_per-vhost.yml +++ b/test/test_custom/test_per-vhost.yml @@ -4,10 +4,11 @@ services: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./my_custom_proxy_settings.conf:/etc/nginx/vhost.d/web1.nginx-proxy.local:ro web1: - image: web + image: web expose: - "81" environment: @@ -15,9 +16,9 @@ services: VIRTUAL_HOST: web1.nginx-proxy.local web2: - image: web + image: web expose: - "82" environment: WEB_PORTS: 82 - VIRTUAL_HOST: web2.nginx-proxy.local \ No newline at end of file + VIRTUAL_HOST: web2.nginx-proxy.local diff --git a/test/test_custom/test_proxy-wide.yml b/test/test_custom/test_proxy-wide.yml index 3018131..602f344 100644 --- a/test/test_custom/test_proxy-wide.yml +++ b/test/test_custom/test_proxy-wide.yml @@ -4,10 +4,11 @@ services: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./my_custom_proxy_settings.conf:/etc/nginx/conf.d/my_custom_proxy_settings.conf:ro web1: - image: web + image: web expose: - "81" environment: @@ -15,9 +16,9 @@ services: VIRTUAL_HOST: web1.nginx-proxy.local web2: - image: web + image: web expose: - "82" environment: WEB_PORTS: 82 - VIRTUAL_HOST: web2.nginx-proxy.local \ No newline at end of file + VIRTUAL_HOST: web2.nginx-proxy.local diff --git a/test/test_default-host.yml b/test/test_default-host.yml index 590dcaa..f195f58 100644 --- a/test/test_default-host.yml +++ b/test/test_default-host.yml @@ -13,5 +13,6 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro environment: DEFAULT_HOST: web1.tld diff --git a/test/test_dockergen/test_dockergen_v2.yml b/test/test_dockergen/test_dockergen_v2.yml index 0d2cab0..0fc8af5 100644 --- a/test/test_dockergen/test_dockergen_v2.yml +++ b/test/test_dockergen/test_dockergen_v2.yml @@ -6,6 +6,7 @@ services: container_name: nginx volumes: - /etc/nginx/conf.d + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro dockergen: image: jwilder/docker-gen @@ -23,4 +24,4 @@ services: - "80" environment: WEB_PORTS: 80 - VIRTUAL_HOST: whoami.nginx.container.docker \ No newline at end of file + VIRTUAL_HOST: whoami.nginx.container.docker diff --git a/test/test_dockergen/test_dockergen_v3.py b/test/test_dockergen/test_dockergen_v3.py index 325d6db..7e1f58c 100644 --- a/test/test_dockergen/test_dockergen_v3.py +++ b/test/test_dockergen/test_dockergen_v3.py @@ -2,12 +2,13 @@ import os import docker import logging import pytest - +import re def versiontuple(v): + # Temporary hack to fix version parsing until PR#755 is pulled + v = re.sub("[^\d\.]", "", v) return tuple(map(int, (v.split(".")))) - docker_version = docker.from_env().version()['Version'] pytestmark = pytest.mark.skipif(versiontuple(docker_version) < versiontuple('1.13'), reason="Docker compose syntax v3 requires docker engine v1.13") diff --git a/test/test_dockergen/test_dockergen_v3.yml b/test/test_dockergen/test_dockergen_v3.yml index 643f49b..fad145a 100644 --- a/test/test_dockergen/test_dockergen_v3.yml +++ b/test/test_dockergen/test_dockergen_v3.yml @@ -5,6 +5,7 @@ services: container_name: nginx volumes: - nginx_conf:/etc/nginx/conf.d + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro dockergen: image: jwilder/docker-gen @@ -24,4 +25,4 @@ services: VIRTUAL_HOST: whoami.nginx.container.docker volumes: - nginx_conf: {} \ No newline at end of file + nginx_conf: {} diff --git a/test/test_events.yml b/test/test_events.yml index d534870..87b7c01 100644 --- a/test/test_events.yml +++ b/test/test_events.yml @@ -2,3 +2,4 @@ nginxproxy: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_headers/test_http.yml b/test/test_headers/test_http.yml index e3596be..8cc2e09 100644 --- a/test/test_headers/test_http.yml +++ b/test/test_headers/test_http.yml @@ -10,4 +10,5 @@ web: sut: image: jwilder/nginx-proxy:test volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro \ No newline at end of file + - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_headers/test_https.yml b/test/test_headers/test_https.yml index 8dc0744..131f61c 100644 --- a/test/test_headers/test_https.yml +++ b/test/test_headers/test_https.yml @@ -13,3 +13,4 @@ sut: - /var/run/docker.sock:/tmp/docker.sock:ro - ./certs/web.nginx-proxy.tld.crt:/etc/nginx/certs/web.nginx-proxy.tld.crt:ro - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/web.nginx-proxy.tld.key:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_ipv6.yml b/test/test_ipv6.yml index c734660..a0b504e 100644 --- a/test/test_ipv6.yml +++ b/test/test_ipv6.yml @@ -1,5 +1,5 @@ web1: - image: web + image: web expose: - "81" environment: @@ -8,7 +8,7 @@ web1: web2: image: web - expose: + expose: - "82" environment: WEB_PORTS: 82 @@ -19,5 +19,6 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro environment: ENABLE_IPV6: "true" diff --git a/test/test_multiple-hosts.yml b/test/test_multiple-hosts.yml index 95dcb4a..70269c8 100644 --- a/test/test_multiple-hosts.yml +++ b/test/test_multiple-hosts.yml @@ -11,3 +11,4 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_multiple-networks.yml b/test/test_multiple-networks.yml index c04a292..da3277b 100644 --- a/test/test_multiple-networks.yml +++ b/test/test_multiple-networks.yml @@ -9,12 +9,13 @@ services: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro networks: - net1 - net2 web1: - image: web + image: web expose: - "81" environment: @@ -24,11 +25,11 @@ services: - net1 web2: - image: web + image: web expose: - "82" environment: WEB_PORTS: 82 VIRTUAL_HOST: web2.nginx-proxy.local networks: - - net2 \ No newline at end of file + - net2 diff --git a/test/test_multiple-ports/test_VIRTUAL_PORT.yml b/test/test_multiple-ports/test_VIRTUAL_PORT.yml index d61ac6f..4eb95ea 100644 --- a/test/test_multiple-ports/test_VIRTUAL_PORT.yml +++ b/test/test_multiple-ports/test_VIRTUAL_PORT.yml @@ -12,3 +12,4 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_multiple-ports/test_default-80.yml b/test/test_multiple-ports/test_default-80.yml index 74916a6..f06ccb8 100644 --- a/test/test_multiple-ports/test_default-80.yml +++ b/test/test_multiple-ports/test_default-80.yml @@ -11,3 +11,4 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_multiple-ports/test_single-port-not-80.yml b/test/test_multiple-ports/test_single-port-not-80.yml index 650dd07..15f230a 100644 --- a/test/test_multiple-ports/test_single-port-not-80.yml +++ b/test/test_multiple-ports/test_single-port-not-80.yml @@ -10,4 +10,5 @@ web: sut: image: jwilder/nginx-proxy:test volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro \ No newline at end of file + - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_nominal.yml b/test/test_nominal.yml index 6a582a5..d436499 100644 --- a/test/test_nominal.yml +++ b/test/test_nominal.yml @@ -1,5 +1,5 @@ web1: - image: web + image: web expose: - "81" environment: @@ -8,7 +8,7 @@ web1: web2: image: web - expose: + expose: - "82" environment: WEB_PORTS: 82 @@ -19,3 +19,4 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_ssl/test_nohttp.yml b/test/test_ssl/test_nohttp.yml index 8486c5e..51d63c2 100644 --- a/test/test_ssl/test_nohttp.yml +++ b/test/test_ssl/test_nohttp.yml @@ -12,4 +12,5 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./certs:/etc/nginx/certs:ro diff --git a/test/test_ssl/test_nohttps.yml b/test/test_ssl/test_nohttps.yml index 2e7623a..14140b4 100644 --- a/test/test_ssl/test_nohttps.yml +++ b/test/test_ssl/test_nohttps.yml @@ -11,4 +11,5 @@ web: sut: image: jwilder/nginx-proxy:test volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro \ No newline at end of file + - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro diff --git a/test/test_ssl/test_noredirect.yml b/test/test_ssl/test_noredirect.yml index 8d0b4b2..9149a87 100644 --- a/test/test_ssl/test_noredirect.yml +++ b/test/test_ssl/test_noredirect.yml @@ -12,4 +12,5 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./certs:/etc/nginx/certs:ro diff --git a/test/test_ssl/test_wildcard.yml b/test/test_ssl/test_wildcard.yml index 27840d3..4c77796 100644 --- a/test/test_ssl/test_wildcard.yml +++ b/test/test_ssl/test_wildcard.yml @@ -10,4 +10,5 @@ sut: image: jwilder/nginx-proxy:test volumes: - /var/run/docker.sock:/tmp/docker.sock:ro + - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro - ./certs:/etc/nginx/certs:ro diff --git a/test/test_wildcard_host.yml b/test/test_wildcard_host.yml index a78ee3c..742a8ac 100644 --- a/test/test_wildcard_host.yml +++ b/test/test_wildcard_host.yml @@ -34,4 +34,5 @@ web4: sut: image: jwilder/nginx-proxy:test volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro \ No newline at end of file + - /var/run/docker.sock:/tmp/docker.sock:ro + - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro