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,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "81"
@@ -6,8 +9,7 @@ web:
       WEB_PORTS: 81
       VIRTUAL_HOST: web.nginx-proxy
 
-
+  reverseproxy:
-reverseproxy:
     image: nginxproxy/nginx-proxy:test
     container_name: reverseproxy
     volumes:

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,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: 81
       VIRTUAL_HOST: web1.nginx-proxy.tld
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -14,8 +17,7 @@ web2:
       WEB_PORTS: 82
       VIRTUAL_HOST: web2.nginx-proxy.tld
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/f00.sock:ro

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,11 +1,14 @@
-nginx-proxy:
+version: "2"
+
+services:
+  nginx-proxy:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock: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.example_location:ro
 
-web1:
+  web1:
     image: web
     expose:
       - "81"
@@ -13,7 +16,7 @@ web1:
       WEB_PORTS: 81
       VIRTUAL_HOST: web1.nginx-proxy.example
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -21,7 +24,7 @@ web2:
       WEB_PORTS: 82
       VIRTUAL_HOST: web2.nginx-proxy.example
 
-web3:
+  web3:
     image: web
     expose:
       - "83"

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,5 +1,8 @@
-# GIVEN a webserver with VIRTUAL_HOST set to web1.tld
+version: "2"
-web1:
+
+services:
+  # GIVEN a webserver with VIRTUAL_HOST set to web1.tld
+  web1:
     image: web
     expose:
       - "81"
@@ -7,9 +10,8 @@ web1:
       WEB_PORTS: 81
       VIRTUAL_HOST: web1.tld
 
-
+  # WHEN nginx-proxy runs with DEFAULT_HOST set to web1.tld
-# WHEN nginx-proxy runs with DEFAULT_HOST set to web1.tld
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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,4 +1,7 @@
-nginxproxy:
+version: "2"
+
+services:
+  nginxproxy:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -6,7 +9,7 @@ web:
       WEB_PORTS: 80
       VIRTUAL_HOST: web.nginx-proxy.tld
 
-web-server-tokens-off:
+  web-server-tokens-off:
     image: web
     expose:
       - "80"
@@ -15,8 +18,7 @@ web-server-tokens-off:
       VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
       SERVER_TOKENS: "off"
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_headers/test_https.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -6,7 +9,7 @@ web:
       WEB_PORTS: 80
       VIRTUAL_HOST: web.nginx-proxy.tld
 
-web-server-tokens-off:
+  web-server-tokens-off:
     image: web
     expose:
       - "80"
@@ -15,8 +18,7 @@ web-server-tokens-off:
       VIRTUAL_HOST: web-server-tokens-off.nginx-proxy.tld
       SERVER_TOKENS: "off"
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "*.nginx-proxy.tld"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_internal/test_internal-per-vhost.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -7,7 +10,7 @@ web1:
       VIRTUAL_HOST: web1.nginx-proxy.example
       NETWORK_ACCESS: internal
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -15,9 +18,8 @@ web2:
       WEB_PORTS: 82
       VIRTUAL_HOST: web2.nginx-proxy.example
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     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,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -9,7 +12,7 @@ web1:
       VIRTUAL_DEST: /
       NETWORK_ACCESS: internal
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -19,9 +22,8 @@ web2:
       VIRTUAL_PATH: /web2/
       VIRTUAL_DEST: /
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     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,4 +1,7 @@
-keepalive-disabled:
+version: "2"
+
+services:
+  keepalive-disabled:
     image: web
     expose:
       - "80"
@@ -6,7 +9,7 @@ keepalive-disabled:
       WEB_PORTS: 80
       VIRTUAL_HOST: keepalive-disabled.nginx-proxy.test
 
-keepalive-enabled:
+  keepalive-enabled:
     image: web
     expose:
       - "80"
@@ -16,8 +19,7 @@ keepalive-enabled:
     labels:
       com.github.nginx-proxy.nginx-proxy.keepalive: "64"
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,10 +9,10 @@ web1:
       WEB_PORTS: 81
       VIRTUAL_HOST: nginx-proxy.test
 
-sut:
+  sut:
     container_name: sut
     image: nginxproxy/nginx-proxy:test
     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,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "81"
@@ -6,8 +9,7 @@ web:
       WEB_PORTS: 81
       VIRTUAL_HOST: webA.nginx-proxy.tld,webB.nginx-proxy.tld
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "81"
@@ -7,8 +10,7 @@ web:
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       VIRTUAL_PORT: "90"
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_multiple-ports/test_VIRTUAL_PORT.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -8,7 +11,7 @@ web:
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       VIRTUAL_PORT: 90
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_multiple-ports/test_default-80.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -7,7 +10,7 @@ web:
       WEB_PORTS: "80 81"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "81"
@@ -6,8 +9,7 @@ web:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "web.nginx-proxy.tld"
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: 81
       VIRTUAL_HOST: web.nginx-proxy.tld
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -14,7 +17,7 @@ web2:
       WEB_PORTS: 83
       VIRTUAL_HOST: web.nginx-proxy.tld
 
-web3:
+  web3:
     image: web
     expose:
       - "83"
@@ -23,7 +26,7 @@ web3:
       VIRTUAL_HOST: web.nginx-proxy.tld
     net: "none"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

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

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web:
       WEB_PORTS: 81
       VIRTUAL_HOST: web.nginx-proxy.tld
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_server-down/test_server-down.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "81"
@@ -7,7 +10,7 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
     net: "none"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_ssl/test_dhparam.yml

@@ -1,4 +1,7 @@
-web5:
+version: "2"
+
+services:
+  web5:
     image: web
     expose:
       - "85"
@@ -6,11 +9,11 @@ web5:
       WEB_PORTS: "85"
       VIRTUAL_HOST: "web5.nginx-proxy.tld"
 
-# Intended for testing with `dh-file` container.
+  # Intended for testing with `dh-file` container.
-# VIRTUAL_HOST is paired with site-specific DH param file.
+  # VIRTUAL_HOST is paired with site-specific DH param file.
-# DEFAULT_HOST is required to avoid defaulting to web2,
+  # DEFAULT_HOST is required to avoid defaulting to web2,
-# if not specifying FQDN (`-servername`) in openssl queries.
+  # if not specifying FQDN (`-servername`) in openssl queries.
-web2:
+  web2:
     image: web
     expose:
       - "85"
@@ -18,11 +21,10 @@ web2:
       WEB_PORTS: "85"
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
 
-
+  # sut - System Under Test
-# sut - System Under Test
+  # `docker.sock` required for functionality
-# `docker.sock` required for functionality
+  # `certs` required to enable HTTPS via template
-# `certs` required to enable HTTPS via template
+  with_default_group:
-with_default_group:
     container_name: dh-default
     image: &img-nginxproxy nginxproxy/nginx-proxy:test
     environment: &env-common
@@ -31,7 +33,7 @@ with_default_group:
       - &docker-sock /var/run/docker.sock:/tmp/docker.sock:ro
       - &nginx-certs ./certs:/etc/nginx/certs:ro
 
-with_alternative_group:
+  with_alternative_group:
     container_name: dh-env
     environment:
       - DHPARAM_BITS=3072
@@ -39,7 +41,7 @@ with_alternative_group:
     image: *img-nginxproxy
     volumes: *vols-common
 
-with_invalid_group:
+  with_invalid_group:
     container_name: invalid-group-1024
     environment:
       - DHPARAM_BITS=1024
@@ -47,7 +49,7 @@ with_invalid_group:
     image: *img-nginxproxy
     volumes: *vols-common
 
-with_custom_file:
+  with_custom_file:
     container_name: dh-file
     image: *img-nginxproxy
     environment: *env-common
@@ -56,7 +58,7 @@ with_custom_file:
       - *nginx-certs
       - ../../app/dhparam/ffdhe3072.pem:/etc/nginx/dhparam/dhparam.pem:ro
 
-with_skip:
+  with_skip:
     container_name: dh-skip
     environment:
       - DHPARAM_SKIP=true
@@ -64,7 +66,7 @@ with_skip:
     image: *img-nginxproxy
     volumes: *vols-common
 
-with_skip_backward:
+  with_skip_backward:
     container_name: dh-skip-backward
     environment:
       - DHPARAM_GENERATION=false

test/test_ssl/test_hsts.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "web1.nginx-proxy.tld"
 
-web2:
+  web2:
     image: web
     expose:
       - "81"
@@ -15,7 +18,7 @@ web2:
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
       HSTS: "off"
 
-web3:
+  web3:
     image: web
     expose:
       - "81"
@@ -24,7 +27,7 @@ web3:
       VIRTUAL_HOST: "web3.nginx-proxy.tld"
       HSTS: "max-age=86400; includeSubDomains; preload"
 
-web4:
+  web4:
     image: web
     expose:
       - "81"
@@ -34,7 +37,7 @@ web4:
       HSTS: "off"
       HTTPS_METHOD: "noredirect"
 
-web5:
+  web5:
     image: web
     expose:
       - "81"
@@ -44,7 +47,7 @@ web5:
     labels:
       com.github.nginx-proxy.nginx-proxy.http3.enable: "true"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_ssl/test_https_port.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "*.nginx-proxy.tld"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_ssl/test_nohttp.yml

@@ -1,4 +1,7 @@
-web2:
+version: "2"
+
+services:
+  web2:
     image: web
     expose:
       - "82"
@@ -7,8 +10,7 @@ web2:
       VIRTUAL_HOST: "web2.nginx-proxy.tld"
       HTTPS_METHOD: nohttp
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_ssl/test_nohttps.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "83"
@@ -7,8 +10,7 @@ web:
       VIRTUAL_HOST: "web.nginx-proxy.tld"
       HTTPS_METHOD: nohttps
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_ssl/test_noredirect.yml

@@ -1,4 +1,7 @@
-web3:
+version: "2"
+
+services:
+  web3:
     image: web
     expose:
       - "83"
@@ -7,8 +10,7 @@ web3:
       VIRTUAL_HOST: "web3.nginx-proxy.tld"
       HTTPS_METHOD: noredirect
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_ssl/test_virtual_path.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -8,7 +11,7 @@ web1:
       VIRTUAL_PATH: "/web1/"
       VIRTUAL_DEST: "/"
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -18,9 +21,8 @@ web2:
       VIRTUAL_PATH: "/web2/"
       VIRTUAL_DEST: "/"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - ./certs:/etc/nginx/certs:ro
-

test/test_ssl/test_wildcard.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "*.nginx-proxy.tld"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_trust-downstream-proxy/test_default.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -7,8 +10,7 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_trust-downstream-proxy/test_disabled.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -7,8 +10,7 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     environment:
       TRUST_DOWNSTREAM_PROXY: "false"

test/test_trust-downstream-proxy/test_enabled.yml

@@ -1,4 +1,7 @@
-web:
+version: "2"
+
+services:
+  web:
     image: web
     expose:
       - "80"
@@ -7,8 +10,7 @@ web:
       VIRTUAL_HOST: web.nginx-proxy.tld
       HTTPS_METHOD: noredirect
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     environment:
       TRUST_DOWNSTREAM_PROXY: "true"

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,5 +1,7 @@
+version: "2"
 
-foo:
+services:
+  foo:
     image: web
     expose:
       - "42"
@@ -7,7 +9,7 @@ foo:
       WEB_PORTS: "42"
       VIRTUAL_HOST: "foo.nginx-proxy.test"
 
-web1:
+  web1:
     image: web
     expose:
       - "81"
@@ -17,7 +19,7 @@ web1:
       VIRTUAL_PATH: "/web1/"
       VIRTUAL_DEST: "/"
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -27,7 +29,7 @@ web2:
       VIRTUAL_PATH: "/web2/"
       VIRTUAL_DEST: "/"
 
-web3:
+  web3:
     image: web
     expose:
       - "83"
@@ -36,7 +38,7 @@ web3:
       VIRTUAL_HOST: "nginx-proxy.test"
       VIRTUAL_PATH: "~ ^/(web3|alt)/"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     environment:
       DEFAULT_ROOT: 418
@@ -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,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -8,7 +11,7 @@ web1:
       VIRTUAL_PATH: "/web1/"
       VIRTUAL_DEST: "/"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_virtual-path/test_location_precedence.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -8,7 +11,7 @@ web1:
       VIRTUAL_PATH: "/web1/"
       VIRTUAL_DEST: "/"
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -18,7 +21,7 @@ web2:
       VIRTUAL_PATH: "/web2/"
       VIRTUAL_DEST: "/"
 
-web3:
+  web3:
     image: web
     expose:
       - "83"
@@ -28,7 +31,7 @@ web3:
       VIRTUAL_PATH: "/web3/"
       VIRTUAL_DEST: "/"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_virtual-path/test_virtual_paths.yml

@@ -1,5 +1,7 @@
+version: "2"
 
-foo:
+services:
+  foo:
     image: web
     expose:
       - "42"
@@ -7,7 +9,7 @@ foo:
       WEB_PORTS: "42"
       VIRTUAL_HOST: "foo.nginx-proxy.test"
 
-web1:
+  web1:
     image: web
     expose:
       - "81"
@@ -17,7 +19,7 @@ web1:
       VIRTUAL_PATH: "/web1/"
       VIRTUAL_DEST: "/"
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -27,7 +29,7 @@ web2:
       VIRTUAL_PATH: "/web2/"
       VIRTUAL_DEST: "/"
 
-web3:
+  web3:
     image: web
     expose:
       - "83"
@@ -36,7 +38,7 @@ web3:
       VIRTUAL_HOST: "nginx-proxy.test"
       VIRTUAL_PATH: "/"
 
-sut:
+  sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro

test/test_wildcard_host.yml

@@ -1,4 +1,7 @@
-web1:
+version: "2"
+
+services:
+  web1:
     image: web
     expose:
       - "81"
@@ -6,7 +9,7 @@ web1:
       WEB_PORTS: "81"
       VIRTUAL_HOST: "*.nginx-proxy.test"
 
-web2:
+  web2:
     image: web
     expose:
       - "82"
@@ -14,7 +17,7 @@ web2:
       WEB_PORTS: "82"
       VIRTUAL_HOST: "test.nginx-proxy.*"
 
-web3:
+  web3:
     image: web
     expose:
       - "83"
@@ -22,7 +25,7 @@ web3:
       WEB_PORTS: "83"
       VIRTUAL_HOST: ~^web3\..*\.nginx-proxy\.regexp
 
-web4:
+  web4:
     image: web
     expose:
       - "84"
@@ -30,8 +33,7 @@ web4:
       WEB_PORTS: "84"
       VIRTUAL_HOST: ~^web4\..*\.nginx-proxy\.regexp$$ # we need to double the `$` because of docker compose variable interpolation
 
-
+  sut:
-sut:
     image: nginxproxy/nginx-proxy:test
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro