Merge pull request #2565 from nginx-proxy/chore/compose-version-obsolete

chore: docker compose version is obsolete

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
+    command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-      /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
+      - nginx_conf:/etc/nginx/conf.d
 
   whoami:
     image: jwilder/whoami

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy

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

test/stress_tests/test_unreachable_network/docker-compose.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   netA:
   netB:

test/test_DOCKER_HOST_unix_socket.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_acme_http_challenge_location/test_acme_challenge_location_disabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_acme_http_challenge_location/test_acme_challenge_location_enabled_is_default.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_custom-error-page/test_custom-error-page.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_custom/test_defaults-location.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy:test

test/test_custom/test_defaults.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy:test

test/test_custom/test_location-per-vhost.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy:test

test/test_custom/test_per-vhost.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy:test

test/test_custom/test_proxy-wide.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginx-proxy:
     image: nginxproxy/nginx-proxy:test

test/test_default-host.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   # GIVEN a webserver with VIRTUAL_HOST set to web1.tld
   web1:

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:

test/test_dockergen/test_dockergen_v2.py

@@ -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"

test/test_dockergen/test_dockergen_v2.yml

@@ -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

test/test_enable_http_on_missing_cert.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_events.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   nginxproxy:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/custom-fallback.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/nodefault.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/nohttp-on-app.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/nohttp-with-missing-cert.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/nohttp.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/nohttps-on-app.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/nohttps.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/untrusteddefault.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_fallback.data/withdefault.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_headers/test_http.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_headers/test_https.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_host-network-mode/test_host-network-mode.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     internal: true

test/test_host-network-mode/test_proxy-host-network-mode.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   host-network-1:
     image: web

test/test_htpasswd/test_htpasswd_regex_virtual_host.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   regex:
     image: web

test/test_htpasswd/test_htpasswd_virtual_host.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_htpasswd/test_htpasswd_virtual_path.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_http2/test_http2_global_disabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   http2-global-disabled:
     image: web

test/test_http3/test_http3_global_disabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   http3-global-disabled:
     image: web

test/test_http3/test_http3_global_enabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   http3-global-enabled:
     image: web

test/test_http3/test_http3_vhost.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   http3-vhost-enabled:
     image: web

test/test_http_port.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_internal/test_internal-per-vhost.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_internal/test_internal-per-vpath.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_ipv6/test_ipv6.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     enable_ipv6: true

test/test_ipv6/test_ipv6_prefer_ipv4_network.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   ipv4net:
     ipam:

test/test_ipv6/test_ipv6_prefer_ipv6_network.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   ipv4net:
     ipam:

test/test_keepalive.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   keepalive-disabled:
     image: web

test/test_loadbalancing.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   loadbalance-hash:
     image: web

test/test_location-override.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_logs/test_log_disabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_logs/test_log_format.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_logs/test_log_json.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_logs/test_log_json_format.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_multiple-hosts.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_multiple-networks.yml

@@ -1,10 +1,8 @@
-version: "2"
-
 networks:
-  net1: {}
+  net1:
-  net2: {}
+  net2:
-  net3a: {}
+  net3a:
-  net3b: {}
+  net3b:
 
 services:
   nginx-proxy:

test/test_multiports/test_multiports-base-json.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   skipvirtualhost:
     image: web

test/test_multiports/test_multiports-base-yaml.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   skipvirtualhost:
     image: web

test/test_multiports/test_multiports-invalid-syntax.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   invalidsyntax:
     image: web

test/test_multiports/test_multiports-merge.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   merged-singleport:
     image: web

test/test_nominal.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     enable_ipv6: true

test/test_ports/test_VIRTUAL_PORT-single-different-from-single-port.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_ports/test_VIRTUAL_PORT.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_ports/test_default-80.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_ports/test_single-port-not-80.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_raw-ip-vhost.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 networks:
   net1:
     enable_ipv6: true

test/test_server-down/test_load-balancing.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_server-down/test_no-server-down.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_server-down/test_server-down.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_ssl/test_dhparam.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web5:
     image: web

test/test_ssl/test_hsts.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_ssl/test_https_port.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_ssl/test_nohttp.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web2:
     image: web

test/test_ssl/test_nohttps.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_ssl/test_noredirect.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web3:
     image: web

test/test_ssl/test_virtual_path.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_ssl/test_wildcard.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_trust-downstream-proxy/test_default.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_trust-downstream-proxy/test_disabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_trust-downstream-proxy/test_enabled.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_upstream-name/test_predictable-name.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_upstream-name/test_sha1-name.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web:
     image: web

test/test_vhost-empty-string.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_vhost-in-multiple-networks.yml

@@ -1,9 +1,7 @@
-version: "2"
-
 networks:
-  net1: {}
+  net1:
-  net2: {}
+  net2:
-  net3: {}
+  net3:
 
 services:
   nginx-proxy:

test/test_virtual-path/test_custom_conf.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   foo:
     image: web

test/test_virtual-path/test_default-root-none.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_virtual-path/test_forwarding.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_virtual-path/test_location_precedence.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web

test/test_virtual-path/test_virtual_paths.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   foo:
     image: web

test/test_wildcard_host.yml

@@ -1,5 +1,3 @@
-version: "2"
-
 services:
   web1:
     image: web