test: separate containers (contd)

2024-12-18 22:46:05 +01:00 · 2024-12-18 22:46:05 +01:00 · b6f0556b70
commit b6f0556b70
parent e0bbd59313
16 changed files with 325 additions and 170 deletions
--- a/test/stress_tests/test_unreachable_network/docker-compose.yml
+++ b/test/stress_tests/test_unreachable_network/docker-compose.yml
@ -16,7 +16,19 @@ services:
      - netA
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+
+  docker-gen:
+    profiles:
+      - separateContainers
+    networks:
+      - netA
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+    environment:
+      NGINX_CONTAINER_NAME: reverseproxy

  reverseproxynginx:
    profiles:
@ -26,22 +38,10 @@ services:
      - netA
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
+      - *confVolume
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"

-  docker-gen:
-    profiles:
-      - separateContainers
-    networks:
-      - netA
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-    environment:
-      NGINX_CONTAINER_NAME: reverseproxy
-
  webA:
    networks:
      - netA
--- a/test/test_DOCKER_HOST_unix_socket.yml
+++ b/test/test_DOCKER_HOST_unix_socket.yml
@ -24,26 +24,26 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/f00.sock:ro
-    environment:
+      - &dockerSocket /var/run/docker.sock:/f00.sock:ro
+    environment: &nginxProxyEnv
      DOCKER_HOST: unix:///f00.sock

+  sutdockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+    environment:
+      <<: *nginxProxyEnv
+
  sutnginx:
    profiles:
      - separateContainers
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
+      - *confVolume
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"
-
-  sutdockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/f00.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-    environment:
-      DOCKER_HOST: unix:///f00.sock
--- 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
@ -43,12 +43,23 @@ services:
    profiles:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
-    environment:
+    environment: &nginxProxyEnv
      ACME_HTTP_CHALLENGE_LOCATION: "false"
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &certs ./certs:/etc/nginx/certs:ro
+      - &acmeRoot ./acme_root:/usr/share/nginx/html:ro
+
+  sutdockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    environment:
+      <<: *nginxProxyEnv
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *certs

  sutnginx:
    profiles:
@ -56,19 +67,8 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
+      - *confVolume
+      - *certs
+      - *acmeRoot
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"
-
-  sutdockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    environment:
-      ACME_HTTP_CHALLENGE_LOCATION: "false"
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./certs:/etc/nginx/certs:ro
--- 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
@ -44,9 +44,18 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &certs ./certs:/etc/nginx/certs:ro
+      - &acmeRoot ./acme_root:/usr/share/nginx/html:ro
+
+  sutdockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *certs

  sutnginx:
    profiles:
@ -54,17 +63,8 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
+      - *confVolume
+      - *certs
+      - *acmeRoot
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"
-
-  sutdockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./certs:/etc/nginx/certs:ro
--- 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
@ -24,32 +24,32 @@ services:
    profiles:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
-    environment:
+    environment: &nginxProxyEnv
      ACME_HTTP_CHALLENGE_LOCATION: "legacy"
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
-
-  sutnginx:
-    profiles:
-      - separateContainers
-    container_name: nginx-proxy
-    image: nginx:alpine
-    labels:
-      - "com.github.nginx-proxy.nginx-proxy.nginx"
-    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./certs:/etc/nginx/certs:ro
-      - ./acme_root:/usr/share/nginx/html:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &certs ./certs:/etc/nginx/certs:ro
+      - &acmeRoot ./acme_root:/usr/share/nginx/html:ro

  sutdockergen:
    profiles:
      - separateContainers
    image: nginxproxy/nginx-proxy:test-dockergen
    environment:
-      ACME_HTTP_CHALLENGE_LOCATION: "legacy"
+      <<: *nginxProxyEnv
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./certs:/etc/nginx/certs:ro
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *certs
+
+  sutnginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+      - *certs
+      - *acmeRoot
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"
--- a/test/test_custom-error-page/test_custom-error-page.yml
+++ b/test/test_custom-error-page/test_custom-error-page.yml
@ -1,6 +1,32 @@
+volumes:
+  nginx_conf:
+
+
 services:
  sut:
+    profiles:
+      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./50x.html:/usr/share/nginx/html/errors/50x.html:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &customErrorPage ./50x.html:/usr/share/nginx/html/errors/50x.html:ro
+
+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *customErrorPage
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+      - *customErrorPage
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"
--- a/test/test_custom/test_defaults-location.yml
+++ b/test/test_custom/test_defaults-location.yml
@ -8,9 +8,19 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/default_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/web3.nginx-proxy.example_location:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &defaultLocation ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/default_location:ro
+      - &vhostLocation ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/web3.nginx-proxy.example_location:ro
+
+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *defaultLocation
+      - *vhostLocation

  nginx-proxy-nginx:
    profiles:
@ -18,22 +28,12 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/default_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/web3.nginx-proxy.example_location:ro
+      - *confVolume
+      - *defaultLocation
+      - *vhostLocation
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"

-  nginx-proxy-dockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./my_custom_proxy_settings_f00.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:
    image: web
    expose:
--- a/test/test_custom/test_defaults.yml
+++ b/test/test_custom/test_defaults.yml
@ -8,8 +8,17 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/proxy.conf:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &defaultConf ./my_custom_proxy_settings_f00.conf:/etc/nginx/proxy.conf:ro
+
+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *defaultConf

  nginx-proxy-nginx:
    profiles:
@ -17,20 +26,11 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/proxy.conf:ro
+      - *confVolume
+      - *defaultConf
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"

-  nginx-proxy-dockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/proxy.conf:ro
-
  web1:
    image: web
    expose:
--- a/test/test_custom/test_location-per-vhost.yml
+++ b/test/test_custom/test_location-per-vhost.yml
@ -8,9 +8,19 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430_location:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &vhostLocationConf ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example_location:ro
+      - &regexLocationConf ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430_location:ro
+
+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *vhostLocationConf
+      - *regexLocationConf

  nginx-proxy-nginx:
    profiles:
@ -18,22 +28,12 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430_location:ro
+      - *confVolume
+      - *vhostLocationConf
+      - *regexLocationConf
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"

-  nginx-proxy-dockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example_location:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430_location:ro
-
  web1:
    image: web
    expose:
--- a/test/test_custom/test_per-vhost.yml
+++ b/test/test_custom/test_per-vhost.yml
@ -8,9 +8,19 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &vhostConf ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example:ro
+      - &regexConf ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430:ro
+
+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *vhostConf
+      - *regexConf

  nginx-proxy-nginx:
    profiles:
@ -18,22 +28,12 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430:ro
+      - *confVolume
+      - *vhostConf
+      - *regexConf
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"

-  nginx-proxy-dockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/vhost.d/web1.nginx-proxy.example:ro
-      - ./my_custom_proxy_settings_bar.conf:/etc/nginx/vhost.d/561032515ede3ab3a015edfb244608b72409c430:ro
-
  web1:
    image: web
    expose:
--- a/test/test_custom/test_proxy-wide.yml
+++ b/test/test_custom/test_proxy-wide.yml
@ -8,8 +8,17 @@ services:
      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/conf.d/my_custom_proxy_settings_f00.conf:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &proxyConf ./my_custom_proxy_settings_f00.conf:/etc/nginx/conf.d/my_custom_proxy_settings_f00.conf:ro
+
+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *proxyConf

  nginx-proxy-nginx:
    profiles:
@ -17,20 +26,11 @@ services:
    container_name: nginx-proxy
    image: nginx:alpine
    volumes:
-      - nginx_conf:/etc/nginx/conf.d:ro
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/conf.d/my_custom_proxy_settings_f00.conf:ro
+      - *confVolume
+      - *proxyConf
    labels:
      - "com.github.nginx-proxy.nginx-proxy.nginx"

-  nginx-proxy-dockergen:
-    profiles:
-      - separateContainers
-    image: nginxproxy/nginx-proxy:test-dockergen
-    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - nginx_conf:/etc/nginx/conf.d
-      - ./my_custom_proxy_settings_f00.conf:/etc/nginx/conf.d/my_custom_proxy_settings_f00.conf:ro
-
  web1:
    image: web
    expose:
--- a/test/test_debug_endpoint/test_global.yml
+++ b/test/test_debug_endpoint/test_global.yml
@ -1,11 +1,37 @@
+volumes:
+  nginx_conf:
+
+
 services:
  nginx-proxy:
+    profiles:
+      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-    environment:
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+    environment: &nginxProxyEnv
      DEBUG_ENDPOINT: "true"

+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+    environment:
+      <<: *nginxProxyEnv
+
+  nginx-proxy-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"
+
  debug_enabled:
    image: web
    expose:
@ -13,7 +39,7 @@ services:
    environment:
      WEB_PORTS: 81
      VIRTUAL_HOST: enabled.debug.nginx-proxy.example
-  
+
  debug_stripped:
    image: web
    expose:
@ -42,7 +68,7 @@ services:
          "/18":
          "/19":
          "/20":
-  
+
  debug_regexp:
    image: web
    expose:
--- a/test/test_debug_endpoint/test_per_container.yml
+++ b/test/test_debug_endpoint/test_per_container.yml
@ -1,8 +1,32 @@
+volumes:
+  nginx_conf:
+
+
 services:
  nginx-proxy:
+    profiles:
+      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+
+  nginx-proxy-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+
+  nginx-proxy-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"

  debug_disabled1:
    image: web
@ -11,7 +35,7 @@ services:
    environment:
      WEB_PORTS: 81
      VIRTUAL_HOST: disabled1.debug.nginx-proxy.example
-  
+
  debug_disabled2:
    image: web
    expose:
@ -20,7 +44,6 @@ services:
      WEB_PORTS: 82
      VIRTUAL_HOST: disabled2.debug.nginx-proxy.example

-
  debug_enabled:
    image: web
    expose:
--- a/test/test_fallback.data/custom-fallback.yml
+++ b/test/test_fallback.data/custom-fallback.yml
@ -1,9 +1,35 @@
+volumes:
+  nginx_conf:
+
+
 services:
  sut:
+    profiles:
+      - singleContainer
    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
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &customFallback ./custom-fallback.conf:/etc/nginx/conf.d/zzz-custom-fallback.conf:ro
+
+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *customFallback
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+      - *customFallback
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"

  http-only:
    image: web
--- a/test/test_fallback.data/nodefault.yml
+++ b/test/test_fallback.data/nodefault.yml
@ -1,9 +1,35 @@
+volumes:
+  nginx_conf:
+
+
 services:
  sut:
+    profiles:
+      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./nodefault.certs:/etc/nginx/certs:ro
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &certs ./nodefault.certs:/etc/nginx/certs:ro
+
+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *certs
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+      - *certs
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"

  https-and-http:
    image: web
--- a/test/test_fallback.data/nohttp-on-app.yml
+++ b/test/test_fallback.data/nohttp-on-app.yml
@ -1,12 +1,40 @@
+volumes:
+  nginx_conf:
+
+
 services:
  sut:
+    profiles:
+      - singleContainer
    image: nginxproxy/nginx-proxy:test
    volumes:
-      - /var/run/docker.sock:/tmp/docker.sock:ro
-      - ./withdefault.certs:/etc/nginx/certs:ro
-    environment:
+      - &dockerSocket /var/run/docker.sock:/tmp/docker.sock:ro
+      - &certs ./withdefault.certs:/etc/nginx/certs:ro
+    environment: &nginxProxyEnv
      HTTPS_METHOD: redirect

+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+      - *certs
+    environment:
+      <<: *nginxProxyEnv
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+      - *certs
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"
+
  https-only:
    image: web
    expose: