test: separate containers (contd)

test/test_DOCKER_HOST_unix_socket.yml

@@ -35,8 +35,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sutnginx:
     profiles:

test/test_acme_http_challenge_location/test_acme_challenge_location_legacy.yml

@@ -35,8 +35,7 @@ services:
     profiles:
       - separateContainers
     image: nginxproxy/nginx-proxy:test-dockergen
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket

test/test_debug_endpoint/test_global.yml

@@ -19,8 +19,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   nginx-proxy-nginx:
     profiles:

test/test_default-host.yml

@@ -24,8 +24,7 @@ services:
     profiles:
       - separateContainers
     image: nginxproxy/nginx-proxy:test-dockergen
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket

test/test_enable_http_on_missing_cert.yml

@@ -17,8 +17,7 @@ services:
     profiles:
       - separateContainers
     image: nginxproxy/nginx-proxy:test-dockergen
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket

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

@@ -21,8 +21,7 @@ services:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
       - *certs
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

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

@@ -21,8 +21,7 @@ services:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
       - *certs
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_fallback.data/nohttp.yml

@@ -21,8 +21,7 @@ services:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
       - *certs
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

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

@@ -19,8 +19,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_fallback.data/nohttps.yml

@@ -19,8 +19,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_fallback.data/untrusteddefault.yml

@@ -21,8 +21,7 @@ services:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
       - *certs
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

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

@@ -36,8 +36,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_http2/test_http2_global_disabled.yml

@@ -27,8 +27,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_http3/test_http3_global_enabled.yml

@@ -27,8 +27,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_http_port.yml

@@ -27,8 +27,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_ipv6/test_ipv6.yml

@@ -48,8 +48,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
     networks:
       - net1
 

test/test_ipv6/test_ipv6_prefer_ipv4_network.yml

@@ -55,8 +55,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    networks:
+    networks: *nginxProxyNetworks
-      <<: *nginxProxyNetworks
 
   sut-nginx:
     profiles:

test/test_ipv6/test_ipv6_prefer_ipv6_network.yml

@@ -57,10 +57,8 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
+    networks: *nginxProxyNetworks
-    networks:
-      <<: *nginxProxyNetworks
 
   sut-nginx:
     profiles:

test/test_keepalive.yml

@@ -50,8 +50,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_logs/test_log_disabled.yml

@@ -28,8 +28,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_logs/test_log_format.yml

@@ -28,8 +28,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_logs/test_log_json.yml

@@ -28,8 +28,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_logs/test_log_json_format.yml

@@ -28,8 +28,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    environment:
+    environment: *nginxProxyEnv
-      <<: *nginxProxyEnv
 
   sut-nginx:
     profiles:

test/test_multiple-networks.yml

@@ -29,8 +29,7 @@ services:
     volumes:
       - &confVolume nginx_conf:/etc/nginx/conf.d
       - *dockerSocket
-    networks:
+    networks: *nginxProxyNetworks
-      <<: *nginxProxyNetworks
 
   nginx-proxy-nginx:
     profiles:
@@ -41,8 +40,7 @@ services:
       - *confVolume
     labels:
       - "com.github.nginx-proxy.nginx-proxy.nginx"
-    networks:
+    networks: *nginxProxyNetworks
-      <<: *nginxProxyNetworks
 
   web1:
     image: web

test/test_server-down/test_load-balancing.yml

@@ -1,3 +1,7 @@
+volumes:
+  nginx_conf:
+
+
 services:
   web1:
     image: web
@@ -25,6 +29,26 @@ services:
     network_mode: "none"
 
   sut:
+    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
+
+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"

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

@@ -1,3 +1,7 @@
+volumes:
+  nginx_conf:
+
+
 services:
   web:
     image: web
@@ -8,6 +12,26 @@ services:
       VIRTUAL_HOST: web.nginx-proxy.tld
 
   sut:
+    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
+
+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"

test/test_server-down/test_server-down.yml

@@ -1,3 +1,7 @@
+volumes:
+  nginx_conf:
+
+
 services:
   web:
     image: web
@@ -9,6 +13,26 @@ services:
     network_mode: "none"
 
   sut:
+    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
+
+  sut-dockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    volumes:
+      - &confVolume nginx_conf:/etc/nginx/conf.d
+      - *dockerSocket
+
+  sut-nginx:
+    profiles:
+      - separateContainers
+    container_name: nginx-proxy
+    image: nginx:alpine
+    volumes:
+      - *confVolume
+    labels:
+      - "com.github.nginx-proxy.nginx-proxy.nginx"