Browse Source

tests: Remove dhparam volume

No longer necessary for the majority of tests.
polarathene 3 years ago
parent
commit
9299a2801e
38 changed files with 0 additions and 38 deletions
  1. 0 1
      test/test_DOCKER_HOST_unix_socket.yml
  2. 0 1
      test/test_composev2.yml
  3. 0 1
      test/test_custom/test_defaults-location.yml
  4. 0 1
      test/test_custom/test_defaults.yml
  5. 0 1
      test/test_custom/test_location-per-vhost.yml
  6. 0 1
      test/test_custom/test_per-vhost.yml
  7. 0 1
      test/test_custom/test_proxy-wide.yml
  8. 0 1
      test/test_debug/test_proxy-debug-flag.yml
  9. 0 1
      test/test_debug/test_server-debug-flag.yml
  10. 0 1
      test/test_default-host.yml
  11. 0 1
      test/test_dockergen/test_dockergen_v2.yml
  12. 0 1
      test/test_dockergen/test_dockergen_v3.yml
  13. 0 1
      test/test_events.yml
  14. 0 1
      test/test_headers/test_http.yml
  15. 0 1
      test/test_headers/test_https.yml
  16. 0 1
      test/test_http_port.yml
  17. 0 1
      test/test_ipv6.yml
  18. 0 1
      test/test_multiple-hosts.yml
  19. 0 1
      test/test_multiple-networks.yml
  20. 0 1
      test/test_multiple-ports/test_VIRTUAL_PORT-single-different-from-single-port.yml
  21. 0 1
      test/test_multiple-ports/test_VIRTUAL_PORT.yml
  22. 0 1
      test/test_multiple-ports/test_default-80.yml
  23. 0 1
      test/test_multiple-ports/test_single-port-not-80.yml
  24. 0 1
      test/test_nominal.yml
  25. 0 1
      test/test_raw-ip-vhost.yml
  26. 0 1
      test/test_server-down/test_load-balancing.yml
  27. 0 1
      test/test_server-down/test_no-server-down.yml
  28. 0 1
      test/test_server-down/test_server-down.yml
  29. 0 1
      test/test_ssl/test_hsts.yml
  30. 0 1
      test/test_ssl/test_https_port.yml
  31. 0 1
      test/test_ssl/test_nohttp.yml
  32. 0 1
      test/test_ssl/test_nohttps.yml
  33. 0 1
      test/test_ssl/test_noredirect.yml
  34. 0 1
      test/test_ssl/test_wildcard.yml
  35. 0 1
      test/test_ssl/wildcard_cert_and_nohttps/docker-compose.yml
  36. 0 1
      test/test_upstream-name/test_predictable-name.yml
  37. 0 1
      test/test_upstream-name/test_sha1-name.yml
  38. 0 1
      test/test_wildcard_host.yml

+ 0 - 1
test/test_DOCKER_HOST_unix_socket.yml

@@ -19,6 +19,5 @@ sut:
   image: nginxproxy/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

+ 0 - 1
test/test_composev2.yml

@@ -4,7 +4,6 @@ services:
     image: nginxproxy/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

+ 0 - 1
test/test_custom/test_defaults-location.yml

@@ -2,7 +2,6 @@ nginx-proxy:
   image: nginxproxy/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
 

+ 0 - 1
test/test_custom/test_defaults.yml

@@ -4,7 +4,6 @@ services:
     image: nginxproxy/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:

+ 0 - 1
test/test_custom/test_location-per-vhost.yml

@@ -4,7 +4,6 @@ services:
     image: nginxproxy/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:

+ 0 - 1
test/test_custom/test_per-vhost.yml

@@ -4,7 +4,6 @@ services:
     image: nginxproxy/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:

+ 0 - 1
test/test_custom/test_proxy-wide.yml

@@ -4,7 +4,6 @@ services:
     image: nginxproxy/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:

+ 0 - 1
test/test_debug/test_proxy-debug-flag.yml

@@ -22,6 +22,5 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
   environment:
     DEBUG: "true"

+ 0 - 1
test/test_debug/test_server-debug-flag.yml

@@ -23,4 +23,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_default-host.yml

@@ -13,6 +13,5 @@ sut:
   image: nginxproxy/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

+ 0 - 1
test/test_dockergen/test_dockergen_v2.yml

@@ -6,7 +6,6 @@ services:
     container_name: nginx
     volumes:
       - /etc/nginx/conf.d
-      - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
 
   dockergen:
     image: jwilder/docker-gen

+ 0 - 1
test/test_dockergen/test_dockergen_v3.yml

@@ -5,7 +5,6 @@ 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

+ 0 - 1
test/test_events.yml

@@ -2,4 +2,3 @@ nginxproxy:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_headers/test_http.yml

@@ -20,4 +20,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_headers/test_https.yml

@@ -26,4 +26,3 @@ sut:
     - ./certs/web.nginx-proxy.tld.key:/etc/nginx/certs/web.nginx-proxy.tld.key:ro
     - ./certs/web-server-tokens-off.nginx-proxy.tld.crt:/etc/nginx/certs/web-server-tokens-off.nginx-proxy.tld.crt:ro
     - ./certs/web-server-tokens-off.nginx-proxy.tld.key:/etc/nginx/certs/web-server-tokens-off.nginx-proxy.tld.key:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_http_port.yml

@@ -10,6 +10,5 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
   environment:
     HTTP_PORT: 8080

+ 0 - 1
test/test_ipv6.yml

@@ -33,7 +33,6 @@ services:
     image: nginxproxy/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"
     networks:

+ 0 - 1
test/test_multiple-hosts.yml

@@ -11,4 +11,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_multiple-networks.yml

@@ -9,7 +9,6 @@ services:
     image: nginxproxy/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

+ 0 - 1
test/test_multiple-ports/test_VIRTUAL_PORT-single-different-from-single-port.yml

@@ -12,4 +12,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_multiple-ports/test_VIRTUAL_PORT.yml

@@ -12,4 +12,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_multiple-ports/test_default-80.yml

@@ -11,4 +11,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_multiple-ports/test_single-port-not-80.yml

@@ -11,4 +11,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_nominal.yml

@@ -33,6 +33,5 @@ services:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
     networks:
       - net1

+ 0 - 1
test/test_raw-ip-vhost.yml

@@ -41,7 +41,6 @@ services:
       ENABLE_IPV6: "true"
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
     networks:
       net1:
         ipv4_address: 172.20.0.4

+ 0 - 1
test/test_server-down/test_load-balancing.yml

@@ -27,4 +27,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_server-down/test_no-server-down.yml

@@ -10,4 +10,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_server-down/test_server-down.yml

@@ -11,4 +11,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_ssl/test_hsts.yml

@@ -38,5 +38,4 @@ sut:
   image: nginxproxy/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

+ 0 - 1
test/test_ssl/test_https_port.yml

@@ -10,7 +10,6 @@ sut:
   image: nginxproxy/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
   environment:
     HTTP_PORT: 8080

+ 0 - 1
test/test_ssl/test_nohttp.yml

@@ -12,5 +12,4 @@ sut:
   image: nginxproxy/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

+ 0 - 1
test/test_ssl/test_nohttps.yml

@@ -12,4 +12,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_ssl/test_noredirect.yml

@@ -12,5 +12,4 @@ sut:
   image: nginxproxy/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

+ 0 - 1
test/test_ssl/test_wildcard.yml

@@ -10,5 +10,4 @@ sut:
   image: nginxproxy/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

+ 0 - 1
test/test_ssl/wildcard_cert_and_nohttps/docker-compose.yml

@@ -7,7 +7,6 @@ services:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./certs:/etc/nginx/certs:ro
-      - ../../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
 
   web1:
     image: web

+ 0 - 1
test/test_upstream-name/test_predictable-name.yml

@@ -13,4 +13,3 @@ services:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro

+ 0 - 1
test/test_upstream-name/test_sha1-name.yml

@@ -13,6 +13,5 @@ services:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ../lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro
     environment:
       SHA1_UPSTREAM_NAME: "true"

+ 0 - 1
test/test_wildcard_host.yml

@@ -35,4 +35,3 @@ sut:
   image: nginxproxy/nginx-proxy:test
   volumes:
     - /var/run/docker.sock:/tmp/docker.sock:ro
-    - ./lib/ssl/dhparam.pem:/etc/nginx/dhparam/dhparam.pem:ro