diff --git a/docker-compose-separate-containers.yml b/docker-compose-separate-containers.yml index 5a64895..3ceea45 100644 --- a/docker-compose-separate-containers.yml +++ b/docker-compose-separate-containers.yml @@ -1,4 +1,5 @@ -version: "2" +volumes: + nginx_conf: services: nginx: @@ -7,17 +8,15 @@ services: ports: - "80:80" volumes: - - /etc/nginx/conf.d + - nginx_conf:/etc/nginx/conf.d:ro dockergen: image: nginxproxy/docker-gen - command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl - /etc/nginx/conf.d/default.conf - volumes_from: - - nginx + command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf volumes: - /var/run/docker.sock:/tmp/docker.sock:ro - ./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl + - nginx_conf:/etc/nginx/conf.d whoami: image: jwilder/whoami diff --git a/docker-compose.yml b/docker-compose.yml index a261ffc..a263755 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy diff --git a/docs/README.md b/docs/README.md index 35d59b4..5d8da45 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1150,8 +1150,6 @@ docker run -e VIRTUAL_HOST=foo.bar.com ... ## Docker Compose ```yaml -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy diff --git a/test/stress_tests/test_unreachable_network/docker-compose.yml b/test/stress_tests/test_unreachable_network/docker-compose.yml index f90a441..b6407e1 100644 --- a/test/stress_tests/test_unreachable_network/docker-compose.yml +++ b/test/stress_tests/test_unreachable_network/docker-compose.yml @@ -1,5 +1,3 @@ -version: "2" - networks: netA: netB: diff --git a/test/test_DOCKER_HOST_unix_socket.yml b/test/test_DOCKER_HOST_unix_socket.yml index caeaa2a..1c410dc 100644 --- a/test/test_DOCKER_HOST_unix_socket.yml +++ b/test/test_DOCKER_HOST_unix_socket.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml b/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml index 3cd4f2d..bf4bdf3 100644 --- a/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml +++ b/test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml b/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml index 41439e3..06d0e35 100644 --- a/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml +++ b/test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml b/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml index 693f9e0..b253e38 100644 --- a/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml +++ b/test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_custom-error-page/test_custom-error-page.yml b/test/test_custom-error-page/test_custom-error-page.yml index 419b7eb..18ad3c1 100644 --- a/test/test_custom-error-page/test_custom-error-page.yml +++ b/test/test_custom-error-page/test_custom-error-page.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_custom/test_defaults-location.yml b/test/test_custom/test_defaults-location.yml index 6e89650..6247a25 100644 --- a/test/test_custom/test_defaults-location.yml +++ b/test/test_custom/test_defaults-location.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy:test diff --git a/test/test_custom/test_defaults.yml b/test/test_custom/test_defaults.yml index 2f25387..9733b55 100644 --- a/test/test_custom/test_defaults.yml +++ b/test/test_custom/test_defaults.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy:test diff --git a/test/test_custom/test_location-per-vhost.yml b/test/test_custom/test_location-per-vhost.yml index 71e606a..ef0380a 100644 --- a/test/test_custom/test_location-per-vhost.yml +++ b/test/test_custom/test_location-per-vhost.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy:test diff --git a/test/test_custom/test_per-vhost.yml b/test/test_custom/test_per-vhost.yml index 0795cef..c01ba05 100644 --- a/test/test_custom/test_per-vhost.yml +++ b/test/test_custom/test_per-vhost.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy:test diff --git a/test/test_custom/test_proxy-wide.yml b/test/test_custom/test_proxy-wide.yml index 22e5c18..8c81782 100644 --- a/test/test_custom/test_proxy-wide.yml +++ b/test/test_custom/test_proxy-wide.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginx-proxy: image: nginxproxy/nginx-proxy:test diff --git a/test/test_default-host.yml b/test/test_default-host.yml index 405bb08..61b2504 100644 --- a/test/test_default-host.yml +++ b/test/test_default-host.yml @@ -1,5 +1,3 @@ -version: "2" - services: # GIVEN a webserver with VIRTUAL_HOST set to web1.tld web1: diff --git a/test/test_dockergen/test_dockergen_v3.py b/test/test_dockergen/test_dockergen.py similarity index 100% rename from test/test_dockergen/test_dockergen_v3.py rename to test/test_dockergen/test_dockergen.py diff --git a/test/test_dockergen/test_dockergen_v3.yml b/test/test_dockergen/test_dockergen.yml similarity index 89% rename from test/test_dockergen/test_dockergen_v3.yml rename to test/test_dockergen/test_dockergen.yml index 7e4aef8..9b96bb2 100644 --- a/test/test_dockergen/test_dockergen_v3.yml +++ b/test/test_dockergen/test_dockergen.yml @@ -1,11 +1,9 @@ -version: "3" - services: nginx: image: nginx container_name: nginx volumes: - - nginx_conf:/etc/nginx/conf.d + - nginx_conf:/etc/nginx/conf.d:ro dockergen: image: nginxproxy/docker-gen @@ -25,4 +23,4 @@ services: VIRTUAL_HOST: whoami.nginx.container.docker volumes: - nginx_conf: {} + nginx_conf: diff --git a/test/test_dockergen/test_dockergen_v2.py b/test/test_dockergen/test_dockergen_v2.py deleted file mode 100644 index dbb15d4..0000000 --- a/test/test_dockergen/test_dockergen_v2.py +++ /dev/null @@ -1,10 +0,0 @@ -def test_unknown_virtual_host_is_503(docker_compose, nginxproxy): - r = nginxproxy.get("http://unknown.nginx.container.docker/") - assert r.status_code == 503 - - -def test_forwards_to_whoami(docker_compose, nginxproxy): - r = nginxproxy.get("http://whoami.nginx.container.docker/") - assert r.status_code == 200 - whoami_container = docker_compose.containers.get("whoami") - assert r.text == f"I'm {whoami_container.id[:12]}\n" diff --git a/test/test_dockergen/test_dockergen_v2.yml b/test/test_dockergen/test_dockergen_v2.yml deleted file mode 100644 index f98992f..0000000 --- a/test/test_dockergen/test_dockergen_v2.yml +++ /dev/null @@ -1,26 +0,0 @@ -version: "2" - -services: - nginx: - image: nginx - container_name: nginx - volumes: - - /etc/nginx/conf.d - - dockergen: - image: nginxproxy/docker-gen - command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf - volumes_from: - - nginx - volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro - - ../../nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl - - web: - image: web - container_name: whoami - expose: - - "80" - environment: - WEB_PORTS: 80 - VIRTUAL_HOST: whoami.nginx.container.docker diff --git a/test/test_enable_http_on_missing_cert.yml b/test/test_enable_http_on_missing_cert.yml index 1149ef7..7f5a9d7 100644 --- a/test/test_enable_http_on_missing_cert.yml +++ b/test/test_enable_http_on_missing_cert.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_events.yml b/test/test_events.yml index ac27e1d..e0d0fbb 100644 --- a/test/test_events.yml +++ b/test/test_events.yml @@ -1,5 +1,3 @@ -version: "2" - services: nginxproxy: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/custom-fallback.yml b/test/test_fallback.data/custom-fallback.yml index a150441..943c884 100644 --- a/test/test_fallback.data/custom-fallback.yml +++ b/test/test_fallback.data/custom-fallback.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/nodefault.yml b/test/test_fallback.data/nodefault.yml index 6397a0b..7211bfc 100644 --- a/test/test_fallback.data/nodefault.yml +++ b/test/test_fallback.data/nodefault.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/nohttp-on-app.yml b/test/test_fallback.data/nohttp-on-app.yml index b6ca82a..e4657a8 100644 --- a/test/test_fallback.data/nohttp-on-app.yml +++ b/test/test_fallback.data/nohttp-on-app.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/nohttp-with-missing-cert.yml b/test/test_fallback.data/nohttp-with-missing-cert.yml index 292ad74..aaf92fd 100644 --- a/test/test_fallback.data/nohttp-with-missing-cert.yml +++ b/test/test_fallback.data/nohttp-with-missing-cert.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/nohttp.yml b/test/test_fallback.data/nohttp.yml index 9d47d51..6b7f375 100644 --- a/test/test_fallback.data/nohttp.yml +++ b/test/test_fallback.data/nohttp.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/nohttps-on-app.yml b/test/test_fallback.data/nohttps-on-app.yml index 966154c..b74103b 100644 --- a/test/test_fallback.data/nohttps-on-app.yml +++ b/test/test_fallback.data/nohttps-on-app.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/nohttps.yml b/test/test_fallback.data/nohttps.yml index c733492..eeb9239 100644 --- a/test/test_fallback.data/nohttps.yml +++ b/test/test_fallback.data/nohttps.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/untrusteddefault.yml b/test/test_fallback.data/untrusteddefault.yml index 5e9e860..7f021ac 100644 --- a/test/test_fallback.data/untrusteddefault.yml +++ b/test/test_fallback.data/untrusteddefault.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_fallback.data/withdefault.yml b/test/test_fallback.data/withdefault.yml index 00ed4b8..4c9d3bb 100644 --- a/test/test_fallback.data/withdefault.yml +++ b/test/test_fallback.data/withdefault.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_headers/test_http.yml b/test/test_headers/test_http.yml index fa59840..bc18b86 100644 --- a/test/test_headers/test_http.yml +++ b/test/test_headers/test_http.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_headers/test_https.yml b/test/test_headers/test_https.yml index 0300d43..cd9a513 100644 --- a/test/test_headers/test_https.yml +++ b/test/test_headers/test_https.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_host-network-mode/test_host-network-mode.yml b/test/test_host-network-mode/test_host-network-mode.yml index 1f2769c..82cc33b 100644 --- a/test/test_host-network-mode/test_host-network-mode.yml +++ b/test/test_host-network-mode/test_host-network-mode.yml @@ -1,5 +1,3 @@ -version: "2" - networks: net1: internal: true diff --git a/test/test_host-network-mode/test_proxy-host-network-mode.yml b/test/test_host-network-mode/test_proxy-host-network-mode.yml index 32106e2..6978c73 100644 --- a/test/test_host-network-mode/test_proxy-host-network-mode.yml +++ b/test/test_host-network-mode/test_proxy-host-network-mode.yml @@ -1,5 +1,3 @@ -version: "2" - services: host-network-1: image: web diff --git a/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml b/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml index 7f0d1bc..8eb9012 100644 --- a/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml +++ b/test/test_htpasswd/test_htpasswd_regex_virtual_host.yml @@ -1,5 +1,3 @@ -version: "2" - services: regex: image: web diff --git a/test/test_htpasswd/test_htpasswd_virtual_host.yml b/test/test_htpasswd/test_htpasswd_virtual_host.yml index b3f15df..5848194 100644 --- a/test/test_htpasswd/test_htpasswd_virtual_host.yml +++ b/test/test_htpasswd/test_htpasswd_virtual_host.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_htpasswd/test_htpasswd_virtual_path.yml b/test/test_htpasswd/test_htpasswd_virtual_path.yml index ffe1a08..65fc278 100644 --- a/test/test_htpasswd/test_htpasswd_virtual_path.yml +++ b/test/test_htpasswd/test_htpasswd_virtual_path.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_http2/test_http2_global_disabled.yml b/test/test_http2/test_http2_global_disabled.yml index 8fd3cde..5dffa19 100644 --- a/test/test_http2/test_http2_global_disabled.yml +++ b/test/test_http2/test_http2_global_disabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: http2-global-disabled: image: web diff --git a/test/test_http3/test_http3_global_disabled.yml b/test/test_http3/test_http3_global_disabled.yml index 482a5ea..5b83119 100644 --- a/test/test_http3/test_http3_global_disabled.yml +++ b/test/test_http3/test_http3_global_disabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: http3-global-disabled: image: web diff --git a/test/test_http3/test_http3_global_enabled.yml b/test/test_http3/test_http3_global_enabled.yml index 1cd40e0..0825469 100644 --- a/test/test_http3/test_http3_global_enabled.yml +++ b/test/test_http3/test_http3_global_enabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: http3-global-enabled: image: web diff --git a/test/test_http3/test_http3_vhost.yml b/test/test_http3/test_http3_vhost.yml index 345bb30..1d5cdf2 100644 --- a/test/test_http3/test_http3_vhost.yml +++ b/test/test_http3/test_http3_vhost.yml @@ -1,5 +1,3 @@ -version: "2" - services: http3-vhost-enabled: image: web diff --git a/test/test_http_port.yml b/test/test_http_port.yml index a346982..7c8f5f8 100644 --- a/test/test_http_port.yml +++ b/test/test_http_port.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_internal/test_internal-per-vhost.yml b/test/test_internal/test_internal-per-vhost.yml index cc67c22..f01c7cf 100644 --- a/test/test_internal/test_internal-per-vhost.yml +++ b/test/test_internal/test_internal-per-vhost.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_internal/test_internal-per-vpath.yml b/test/test_internal/test_internal-per-vpath.yml index 35e92f0..f8e03d6 100644 --- a/test/test_internal/test_internal-per-vpath.yml +++ b/test/test_internal/test_internal-per-vpath.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_ipv6/test_ipv6.yml b/test/test_ipv6/test_ipv6.yml index d5fec9b..d7276a6 100644 --- a/test/test_ipv6/test_ipv6.yml +++ b/test/test_ipv6/test_ipv6.yml @@ -1,5 +1,3 @@ -version: "2" - networks: net1: enable_ipv6: true diff --git a/test/test_ipv6/test_ipv6_prefer_ipv4_network.yml b/test/test_ipv6/test_ipv6_prefer_ipv4_network.yml index 8c36dc5..2021856 100644 --- a/test/test_ipv6/test_ipv6_prefer_ipv4_network.yml +++ b/test/test_ipv6/test_ipv6_prefer_ipv4_network.yml @@ -1,5 +1,3 @@ -version: "2" - networks: ipv4net: ipam: diff --git a/test/test_ipv6/test_ipv6_prefer_ipv6_network.yml b/test/test_ipv6/test_ipv6_prefer_ipv6_network.yml index 236d8d8..b12eb0d 100644 --- a/test/test_ipv6/test_ipv6_prefer_ipv6_network.yml +++ b/test/test_ipv6/test_ipv6_prefer_ipv6_network.yml @@ -1,5 +1,3 @@ -version: "2" - networks: ipv4net: ipam: diff --git a/test/test_keepalive.yml b/test/test_keepalive.yml index dff56b0..9631eca 100644 --- a/test/test_keepalive.yml +++ b/test/test_keepalive.yml @@ -1,5 +1,3 @@ -version: "2" - services: keepalive-disabled: image: web diff --git a/test/test_loadbalancing.yml b/test/test_loadbalancing.yml index 72155fb..b8f42eb 100644 --- a/test/test_loadbalancing.yml +++ b/test/test_loadbalancing.yml @@ -1,5 +1,3 @@ -version: "2" - services: loadbalance-hash: image: web diff --git a/test/test_location-override.yml b/test/test_location-override.yml index 9ba4eb8..f36b206 100644 --- a/test/test_location-override.yml +++ b/test/test_location-override.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_logs/test_log_disabled.yml b/test/test_logs/test_log_disabled.yml index 2d8a59c..05000ef 100644 --- a/test/test_logs/test_log_disabled.yml +++ b/test/test_logs/test_log_disabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_logs/test_log_format.yml b/test/test_logs/test_log_format.yml index 2a32e3d..211ae31 100644 --- a/test/test_logs/test_log_format.yml +++ b/test/test_logs/test_log_format.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_logs/test_log_json.yml b/test/test_logs/test_log_json.yml index 2e6fefd..75bb42e 100644 --- a/test/test_logs/test_log_json.yml +++ b/test/test_logs/test_log_json.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_logs/test_log_json_format.yml b/test/test_logs/test_log_json_format.yml index 5e01e92..71810b3 100644 --- a/test/test_logs/test_log_json_format.yml +++ b/test/test_logs/test_log_json_format.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_multiple-hosts.yml b/test/test_multiple-hosts.yml index 832aac4..d9cb661 100644 --- a/test/test_multiple-hosts.yml +++ b/test/test_multiple-hosts.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_multiple-networks.yml b/test/test_multiple-networks.yml index 3e34b48..edc12ab 100644 --- a/test/test_multiple-networks.yml +++ b/test/test_multiple-networks.yml @@ -1,10 +1,8 @@ -version: "2" - networks: - net1: {} - net2: {} - net3a: {} - net3b: {} + net1: + net2: + net3a: + net3b: services: nginx-proxy: diff --git a/test/test_multiports/test_multiports-base-json.yml b/test/test_multiports/test_multiports-base-json.yml index fc0d0fa..acdfd7b 100644 --- a/test/test_multiports/test_multiports-base-json.yml +++ b/test/test_multiports/test_multiports-base-json.yml @@ -1,5 +1,3 @@ -version: "2" - services: skipvirtualhost: image: web diff --git a/test/test_multiports/test_multiports-base-yaml.yml b/test/test_multiports/test_multiports-base-yaml.yml index 8bd5803..fcdd349 100644 --- a/test/test_multiports/test_multiports-base-yaml.yml +++ b/test/test_multiports/test_multiports-base-yaml.yml @@ -1,5 +1,3 @@ -version: "2" - services: skipvirtualhost: image: web diff --git a/test/test_multiports/test_multiports-invalid-syntax.yml b/test/test_multiports/test_multiports-invalid-syntax.yml index 9f40220..75c1e1f 100644 --- a/test/test_multiports/test_multiports-invalid-syntax.yml +++ b/test/test_multiports/test_multiports-invalid-syntax.yml @@ -1,5 +1,3 @@ -version: "2" - services: invalidsyntax: image: web diff --git a/test/test_multiports/test_multiports-merge.yml b/test/test_multiports/test_multiports-merge.yml index 5c5cd8b..cfaf1bc 100644 --- a/test/test_multiports/test_multiports-merge.yml +++ b/test/test_multiports/test_multiports-merge.yml @@ -1,5 +1,3 @@ -version: "2" - services: merged-singleport: image: web diff --git a/test/test_nominal.yml b/test/test_nominal.yml index 6067895..e6b81a8 100644 --- a/test/test_nominal.yml +++ b/test/test_nominal.yml @@ -1,5 +1,3 @@ -version: "2" - networks: net1: enable_ipv6: true diff --git a/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml b/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml index ba58d4e..bed9515 100644 --- a/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml +++ b/test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_ports/test_VIRTUAL_PORT.yml b/test/test_ports/test_VIRTUAL_PORT.yml index ab1af46..da39484 100644 --- a/test/test_ports/test_VIRTUAL_PORT.yml +++ b/test/test_ports/test_VIRTUAL_PORT.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_ports/test_default-80.yml b/test/test_ports/test_default-80.yml index 0cfdd7e..3774a3c 100644 --- a/test/test_ports/test_default-80.yml +++ b/test/test_ports/test_default-80.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_ports/test_single-port-not-80.yml b/test/test_ports/test_single-port-not-80.yml index eef4e08..5449815 100644 --- a/test/test_ports/test_single-port-not-80.yml +++ b/test/test_ports/test_single-port-not-80.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_raw-ip-vhost.yml b/test/test_raw-ip-vhost.yml index f034bdb..687449e 100644 --- a/test/test_raw-ip-vhost.yml +++ b/test/test_raw-ip-vhost.yml @@ -1,5 +1,3 @@ -version: "2" - networks: net1: enable_ipv6: true diff --git a/test/test_server-down/test_load-balancing.yml b/test/test_server-down/test_load-balancing.yml index 2322590..a778157 100644 --- a/test/test_server-down/test_load-balancing.yml +++ b/test/test_server-down/test_load-balancing.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_server-down/test_no-server-down.yml b/test/test_server-down/test_no-server-down.yml index cd7e5ac..3ad3668 100644 --- a/test/test_server-down/test_no-server-down.yml +++ b/test/test_server-down/test_no-server-down.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_server-down/test_server-down.yml b/test/test_server-down/test_server-down.yml index 98fd30f..07dff85 100644 --- a/test/test_server-down/test_server-down.yml +++ b/test/test_server-down/test_server-down.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_ssl/test_dhparam.yml b/test/test_ssl/test_dhparam.yml index 456b1b3..632a8db 100644 --- a/test/test_ssl/test_dhparam.yml +++ b/test/test_ssl/test_dhparam.yml @@ -1,5 +1,3 @@ -version: "2" - services: web5: image: web diff --git a/test/test_ssl/test_hsts.yml b/test/test_ssl/test_hsts.yml index b84fb80..d0adf8f 100644 --- a/test/test_ssl/test_hsts.yml +++ b/test/test_ssl/test_hsts.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_ssl/test_https_port.yml b/test/test_ssl/test_https_port.yml index b6541ac..0ecfc76 100644 --- a/test/test_ssl/test_https_port.yml +++ b/test/test_ssl/test_https_port.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_ssl/test_nohttp.yml b/test/test_ssl/test_nohttp.yml index 0c21bf9..3c44ee4 100644 --- a/test/test_ssl/test_nohttp.yml +++ b/test/test_ssl/test_nohttp.yml @@ -1,5 +1,3 @@ -version: "2" - services: web2: image: web diff --git a/test/test_ssl/test_nohttps.yml b/test/test_ssl/test_nohttps.yml index 209f57a..c0ca38b 100644 --- a/test/test_ssl/test_nohttps.yml +++ b/test/test_ssl/test_nohttps.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_ssl/test_noredirect.yml b/test/test_ssl/test_noredirect.yml index 7610ae2..19cdd3f 100644 --- a/test/test_ssl/test_noredirect.yml +++ b/test/test_ssl/test_noredirect.yml @@ -1,5 +1,3 @@ -version: "2" - services: web3: image: web diff --git a/test/test_ssl/test_virtual_path.yml b/test/test_ssl/test_virtual_path.yml index eb09ef0..c94fc86 100644 --- a/test/test_ssl/test_virtual_path.yml +++ b/test/test_ssl/test_virtual_path.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_ssl/test_wildcard.yml b/test/test_ssl/test_wildcard.yml index b101e9f..7bba93c 100644 --- a/test/test_ssl/test_wildcard.yml +++ b/test/test_ssl/test_wildcard.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_trust-downstream-proxy/test_default.yml b/test/test_trust-downstream-proxy/test_default.yml index 936dbad..a6a7676 100644 --- a/test/test_trust-downstream-proxy/test_default.yml +++ b/test/test_trust-downstream-proxy/test_default.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_trust-downstream-proxy/test_disabled.yml b/test/test_trust-downstream-proxy/test_disabled.yml index 9318d63..36ca154 100644 --- a/test/test_trust-downstream-proxy/test_disabled.yml +++ b/test/test_trust-downstream-proxy/test_disabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_trust-downstream-proxy/test_enabled.yml b/test/test_trust-downstream-proxy/test_enabled.yml index 9a3e975..800ff6d 100644 --- a/test/test_trust-downstream-proxy/test_enabled.yml +++ b/test/test_trust-downstream-proxy/test_enabled.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_upstream-name/test_predictable-name.yml b/test/test_upstream-name/test_predictable-name.yml index b5caad0..3f8bd7a 100644 --- a/test/test_upstream-name/test_predictable-name.yml +++ b/test/test_upstream-name/test_predictable-name.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_upstream-name/test_sha1-name.yml b/test/test_upstream-name/test_sha1-name.yml index b52a5c9..5c3f048 100644 --- a/test/test_upstream-name/test_sha1-name.yml +++ b/test/test_upstream-name/test_sha1-name.yml @@ -1,5 +1,3 @@ -version: "2" - services: web: image: web diff --git a/test/test_vhost-empty-string.yml b/test/test_vhost-empty-string.yml index 9d2ff52..dfbff1a 100644 --- a/test/test_vhost-empty-string.yml +++ b/test/test_vhost-empty-string.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_vhost-in-multiple-networks.yml b/test/test_vhost-in-multiple-networks.yml index 4e9bb3e..16b82e4 100644 --- a/test/test_vhost-in-multiple-networks.yml +++ b/test/test_vhost-in-multiple-networks.yml @@ -1,9 +1,7 @@ -version: "2" - networks: - net1: {} - net2: {} - net3: {} + net1: + net2: + net3: services: nginx-proxy: diff --git a/test/test_virtual-path/test_custom_conf.yml b/test/test_virtual-path/test_custom_conf.yml index 2c4d6b9..c8489d0 100644 --- a/test/test_virtual-path/test_custom_conf.yml +++ b/test/test_virtual-path/test_custom_conf.yml @@ -1,5 +1,3 @@ -version: "2" - services: foo: image: web diff --git a/test/test_virtual-path/test_default-root-none.yml b/test/test_virtual-path/test_default-root-none.yml index f0172e8..b4de62f 100644 --- a/test/test_virtual-path/test_default-root-none.yml +++ b/test/test_virtual-path/test_default-root-none.yml @@ -1,5 +1,3 @@ -version: "2" - services: sut: image: nginxproxy/nginx-proxy:test diff --git a/test/test_virtual-path/test_forwarding.yml b/test/test_virtual-path/test_forwarding.yml index 9b15c74..72a70b7 100644 --- a/test/test_virtual-path/test_forwarding.yml +++ b/test/test_virtual-path/test_forwarding.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_virtual-path/test_location_precedence.yml b/test/test_virtual-path/test_location_precedence.yml index a250a1d..15385cd 100644 --- a/test/test_virtual-path/test_location_precedence.yml +++ b/test/test_virtual-path/test_location_precedence.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web diff --git a/test/test_virtual-path/test_virtual_paths.yml b/test/test_virtual-path/test_virtual_paths.yml index ac70297..6e51b02 100644 --- a/test/test_virtual-path/test_virtual_paths.yml +++ b/test/test_virtual-path/test_virtual_paths.yml @@ -1,5 +1,3 @@ -version: "2" - services: foo: image: web diff --git a/test/test_wildcard_host.yml b/test/test_wildcard_host.yml index 47e75e4..7d8da51 100644 --- a/test/test_wildcard_host.yml +++ b/test/test_wildcard_host.yml @@ -1,5 +1,3 @@ -version: "2" - services: web1: image: web