From e736f84b87064c7be3545f0fd221c16bd12155ee Mon Sep 17 00:00:00 2001
From: Nicolas Duchon <nicolas.duchon@gmail.com>
Date: Wed, 18 Dec 2024 21:29:36 +0100
Subject: [PATCH] test: test_acme_http_challenge_location separate container

---
 .../test_acme_challenge_location_disabled.yml | 28 +++++++++++++++++++
 ..._challenge_location_enabled_is_default.yml | 26 +++++++++++++++++
 .../test_acme_challenge_location_legacy.yml   | 28 +++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git 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
index bf4bdf3..9fc9975 100644
--- 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
@@ -1,3 +1,6 @@
+volumes:
+  nginx_conf:
+
 services:
   web1:
     image: web
@@ -36,6 +39,8 @@ services:
       ACME_HTTP_CHALLENGE_LOCATION: "true"
 
   sut:
+    profiles:
+      - singleContainer
     image: nginxproxy/nginx-proxy:test
     environment:
       ACME_HTTP_CHALLENGE_LOCATION: "false"
@@ -43,3 +48,26 @@ services:
       - /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
+    volumes:
+      - nginx_conf:/etc/nginx/conf.d:ro
+      - ./certs:/etc/nginx/certs:ro
+      - ./acme_root:/usr/share/nginx/html:ro
+    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
diff --git 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
index 06d0e35..b09b080 100644
--- 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
@@ -1,3 +1,6 @@
+volumes:
+  nginx_conf:
+
 services:
   web1:
     image: web
@@ -36,8 +39,31 @@ services:
       ACME_HTTP_CHALLENGE_LOCATION: "false"
 
   sut:
+    profiles:
+      - 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
+  
+  sutnginx:
+    profiles:
+      - separateContainers
+    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
+    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
diff --git 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
index b253e38..3c260d9 100644
--- 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
@@ -1,3 +1,6 @@
+volumes:
+  nginx_conf:
+
 services:
   web1:
     image: web
@@ -17,6 +20,8 @@ services:
       HTTPS_METHOD: noredirect
 
   sut:
+    profiles:
+      - singleContainer
     image: nginxproxy/nginx-proxy:test
     environment:
       ACME_HTTP_CHALLENGE_LOCATION: "legacy"
@@ -24,3 +29,26 @@ services:
       - /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
+
+  sutdockergen:
+    profiles:
+      - separateContainers
+    image: nginxproxy/nginx-proxy:test-dockergen
+    environment:
+      ACME_HTTP_CHALLENGE_LOCATION: "legacy"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - nginx_conf:/etc/nginx/conf.d
+      - ./certs:/etc/nginx/certs:ro