ci: ensure all compose files are valid compose v2 + formatting

docker-compose-separate-containers.yml

@@ -1,4 +1,5 @@
-version: '2'
+version: "2"
+
 services:
   nginx:
     image: nginx

docker-compose.yml

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

test/stress_tests/test_deleted_cert/docker-compose.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -6,7 +9,6 @@ web:
       WEB_PORTS: 81
       VIRTUAL_HOST: web.nginx-proxy
 
-
   reverseproxy:
     image: nginxproxy/nginx-proxy:test
     container_name: reverseproxy

test/stress_tests/test_unreachable_network/docker-compose.yml

@@ -32,4 +32,3 @@ services:
     environment:
       WEB_PORTS: 82
       VIRTUAL_HOST: webB.nginx-proxy
-

test/test_DOCKER_HOST_unix_socket.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web1:
     image: web
     expose:
@@ -14,7 +17,6 @@ web2:
       WEB_PORTS: 82
       VIRTUAL_HOST: web2.nginx-proxy.tld
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_composev2.yml

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

test/test_custom/test_defaults-location.yml

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

test/test_custom/test_defaults.yml

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

test/test_custom/test_location-per-vhost.yml

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

test/test_custom/test_per-vhost.yml

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

test/test_custom/test_proxy-wide.yml

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

test/test_default-host.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   # GIVEN a webserver with VIRTUAL_HOST set to web1.tld
   web1:
     image: web
@@ -7,7 +10,6 @@ web1:
       WEB_PORTS: 81
       VIRTUAL_HOST: web1.tld
 
-
   # WHEN nginx-proxy runs with DEFAULT_HOST set to web1.tld
   sut:
     image: nginxproxy/nginx-proxy:test

test/test_default-root-none.yml

@@ -1,3 +1,5 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
@@ -5,6 +7,7 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
       DEFAULT_ROOT: none
+
   web:
     image: web
     expose:

test/test_dockergen/test_dockergen_v2.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 services:
   nginx:

test/test_dockergen/test_dockergen_v3.yml

@@ -1,4 +1,5 @@
-version: '3'
+version: "3"
+
 services:
   nginx:
     image: nginx

test/test_events.yml

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

test/test_fallback.data/custom-fallback.yml

@@ -1,9 +1,12 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
+
   http-only:
     image: web
     expose:

test/test_fallback.data/nodefault.yml

@@ -1,9 +1,12 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./nodefault.certs:/etc/nginx/certs:ro
+
   https-and-http:
     image: web
     expose:
@@ -11,6 +14,7 @@ services:
     environment:
       WEB_PORTS: "81"
       VIRTUAL_HOST: https-and-http.nginx-proxy.test
+
   https-only:
     image: web
     expose:
@@ -19,6 +23,7 @@ services:
       WEB_PORTS: "82"
       VIRTUAL_HOST: https-only.nginx-proxy.test
       HTTPS_METHOD: nohttp
+
   http-only:
     image: web
     expose:
@@ -27,6 +32,7 @@ services:
       WEB_PORTS: "83"
       VIRTUAL_HOST: http-only.nginx-proxy.test
       HTTPS_METHOD: nohttps
+
   missing-cert:
     image: web
     expose:

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

@@ -1,3 +1,5 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
@@ -6,6 +8,7 @@ services:
       - ./withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: redirect
+
   https-only:
     image: web
     expose:

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

@@ -1,3 +1,5 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
@@ -6,6 +8,7 @@ services:
       - ./withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: nohttp
+
   https-only:
     image: web
     expose:
@@ -13,6 +16,7 @@ services:
     environment:
       WEB_PORTS: "82"
       VIRTUAL_HOST: https-only.nginx-proxy.test
+
   missing-cert:
     image: web
     expose:

test/test_fallback.data/nohttp.yml

@@ -1,3 +1,5 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
@@ -6,6 +8,7 @@ services:
       - ./withdefault.certs:/etc/nginx/certs:ro
     environment:
       HTTPS_METHOD: nohttp
+
   https-only:
     image: web
     expose:

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

@@ -1,3 +1,5 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
@@ -5,6 +7,7 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
       HTTPS_METHOD: redirect
+
   http-only:
     image: web
     expose:

test/test_fallback.data/nohttps.yml

@@ -1,3 +1,5 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
@@ -5,6 +7,7 @@ services:
       - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
       HTTPS_METHOD: nohttps
+
   http-only:
     image: web
     expose:

test/test_fallback.data/withdefault.yml

@@ -1,9 +1,12 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./withdefault.certs:/etc/nginx/certs:ro
+
   https-and-http:
     image: web
     expose:
@@ -11,6 +14,7 @@ services:
     environment:
       WEB_PORTS: "81"
       VIRTUAL_HOST: https-and-http.nginx-proxy.test
+
   https-only:
     image: web
     expose:
@@ -19,6 +23,7 @@ services:
       WEB_PORTS: "82"
       VIRTUAL_HOST: https-only.nginx-proxy.test
       HTTPS_METHOD: nohttp
+
   http-only:
     image: web
     expose:
@@ -27,6 +32,7 @@ services:
       WEB_PORTS: "83"
       VIRTUAL_HOST: http-only.nginx-proxy.test
       HTTPS_METHOD: nohttps
+
   missing-cert:
     image: web
     expose:

test/test_headers/test_http.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -15,7 +18,6 @@ web-server-tokens-off:
       VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
       SERVER_TOKENS: "off"
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_headers/test_https.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -15,7 +18,6 @@ web-server-tokens-off:
       VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
       SERVER_TOKENS: "off"
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_http2/test_http2_global_disabled.yml

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

test/test_http3/test_http3_global_disabled.yml

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

test/test_http3/test_http3_global_enabled.yml

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

test/test_http3/test_http3_vhost.yml

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

test/test_http_port.yml

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

test/test_internal/test_internal-per-vhost.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web1:
     image: web
     expose:
@@ -20,4 +23,3 @@ sut:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./network_internal.conf:/etc/nginx/network_internal.conf:ro
-

test/test_internal/test_internal-per-vpath.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web1:
     image: web
     expose:
@@ -24,4 +27,3 @@ sut:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./network_internal.conf:/etc/nginx/network_internal.conf:ro
-

test/test_ipv6.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 networks:
   net1:
@@ -28,7 +28,6 @@ services:
     networks:
       - net1
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_keepalive.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   keepalive-disabled:
     image: web
     expose:
@@ -16,7 +19,6 @@ keepalive-enabled:
     labels:
       com.github.nginx-proxy.nginx-proxy.keepalive: "64"
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_loadbalancing.yml

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

test/test_location-override.yml

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

test/test_log_format.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web1:
     image: web
     expose:
@@ -12,4 +15,4 @@ sut:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
-    LOG_FORMAT: "$$remote_addr - $$remote_user [$$time_local] \"$$request\" $$status $$body_bytes_sent \"$$http_referer\" \"$$http_user_agent\" request_time=$$request_time $$upstream_response_time"
+      LOG_FORMAT: '$$remote_addr - $$remote_user [$$time_local] "$$request" $$status $$body_bytes_sent "$$http_referer" "$$http_user_agent" request_time=$$request_time $$upstream_response_time'

test/test_multiple-hosts.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -6,7 +9,6 @@ web:
       WEB_PORTS: 81
       VIRTUAL_HOST: webA.nginx-proxy.tld,webB.nginx-proxy.tld
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_multiple-networks.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 networks:
   net1: {}

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

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -7,7 +10,6 @@ web:
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       VIRTUAL_PORT: "90"
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_multiple-ports/test_VIRTUAL_PORT.yml

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

test/test_multiple-ports/test_default-80.yml

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

test/test_multiple-ports/test_single-port-not-80.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -6,7 +9,6 @@ web:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_nominal.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 networks:
   net1:
@@ -28,7 +28,6 @@ services:
     networks:
       - net1
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_raw-ip-vhost.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 networks:
   net1:

test/test_server-down/test_load-balancing.yml

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

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

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

test/test_server-down/test_server-down.yml

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

test/test_ssl/test_dhparam.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web5:
     image: web
     expose:
@@ -18,7 +21,6 @@ web2:
       WEB_PORTS: "85"
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
 
-
   # sut - System Under Test
   # `docker.sock` required for functionality
   # `certs` required to enable HTTPS via template

test/test_ssl/test_hsts.yml

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

test/test_ssl/test_https_port.yml

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

test/test_ssl/test_nohttp.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web2:
     image: web
     expose:
@@ -7,7 +10,6 @@ web2:
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
       HTTPS_METHOD: nohttp
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_ssl/test_nohttps.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -7,7 +10,6 @@ web:
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       HTTPS_METHOD: nohttps
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_ssl/test_noredirect.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web3:
     image: web
     expose:
@@ -7,7 +10,6 @@ web3:
       VIRTUAL_HOST: "web3.nginx-proxy.tld"
       HTTPS_METHOD: noredirect
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_ssl/test_virtual_path.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web1:
     image: web
     expose:
@@ -23,4 +26,3 @@ sut:
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./certs:/etc/nginx/certs:ro
-

test/test_ssl/test_wildcard.yml

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

test/test_trust-downstream-proxy/test_default.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -7,7 +10,6 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:

test/test_trust-downstream-proxy/test_disabled.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -7,7 +10,6 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     environment:

test/test_trust-downstream-proxy/test_enabled.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web:
     image: web
     expose:
@@ -7,7 +10,6 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     environment:

test/test_upstream-name/test_predictable-name.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 services:
   web:

test/test_upstream-name/test_sha1-name.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 services:
   web:

test/test_vhost-empty-string.yml

@@ -1,8 +1,11 @@
+version: "2"
+
 services:
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
+
   web1:
     image: web
     expose:
@@ -11,6 +14,7 @@ services:
       WEB_PORTS: "81"
       # The space is intentional (should be trimmed).
       VIRTUAL_HOST: " "
+
   web2:
     image: web
     expose:
@@ -19,6 +23,7 @@ services:
       WEB_PORTS: "82"
       # The space is intentional (should be trimmed).
       VIRTUAL_HOST: "web2.nginx-proxy.test ,"
+
   web3:
     image: web
     expose:
@@ -27,6 +32,7 @@ services:
       WEB_PORTS: "83"
       # The space is intentional (should be trimmed).
       VIRTUAL_HOST: " ,web3.nginx-proxy.test"
+
   web4:
     image: web
     expose:

test/test_vhost-in-multiple-networks.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: "2"
 
 networks:
   net1: {}

test/test_virtual-path/test_custom_conf.yml

@@ -1,4 +1,6 @@
+version: "2"
 
+services:
   foo:
     image: web
     expose:
@@ -45,4 +47,3 @@ sut:
       - ./foo.conf:/etc/nginx/vhost.d/foo.nginx-proxy.test:ro
       - ./bar.conf:/etc/nginx/vhost.d/nginx-proxy.test_918d687a929083edd0c7224ee2293e0e7c062ab4_location:ro
       - ./alternate.conf:/etc/nginx/vhost.d/nginx-proxy.test_7fb22b74bbdf907425dbbad18e4462565cada230_location:ro
-

test/test_virtual-path/test_forwarding.yml

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

test/test_virtual-path/test_location_precedence.yml

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

test/test_virtual-path/test_virtual_paths.yml

@@ -1,4 +1,6 @@
+version: "2"
 
+services:
   foo:
     image: web
     expose:

test/test_wildcard_host.yml

@@ -1,3 +1,6 @@
+version: "2"
+
+services:
   web1:
     image: web
     expose:
@@ -30,7 +33,6 @@ web4:
       WEB_PORTS: "84"
       VIRTUAL_HOST: ~^web4\..*\.nginx-proxy\.regexp$$ # we need to double the `$` because of docker compose variable interpolation
 
-
   sut:
     image: nginxproxy/nginx-proxy:test
     volumes: