From 78307266d4b311086aabfcb34060bcfe16944011 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Fri, 31 Jan 2025 22:52:48 +0100
Subject: [PATCH 1/3] Revert commit 142a159 to support python docker 5

Debian bookworm (current stable) still has python3-docker 5.0.3. The
reverted commit prevented the test-suite to run natively on this distro.

The version check could be bumped again when the next Debian stable (trixie)
will be released (by fall 2025 hopefully).
---
 test/conftest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/conftest.py b/test/conftest.py
index 56cda49..2b1ab44 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -616,5 +616,5 @@ try:
 except docker.errors.ImageNotFound:
     pytest.exit("The docker image 'nginxproxy/nginx-proxy:test' is missing")
 
-if Version(docker.__version__) < Version("7.0.0"):
-    pytest.exit("This test suite is meant to work with the python docker module v7.0.0 or later")
+if Version(docker.__version__) < Version("5.0.0"):
+    pytest.exit("This test suite is meant to work with the python docker module v5.0.0 or later")

From 06f412f6220978ad2f307980919e7a64ea30460d Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Fri, 31 Jan 2025 22:59:01 +0100
Subject: [PATCH 2/3] ci: fix a few tests to support docker-compose v1

---
 test/test_custom/test_location-per-vhost.yml            | 2 +-
 test/test_custom/test_per-vhost.yml                     | 2 +-
 test/test_htpasswd/test_htpasswd-regex-virtual-host.yml | 2 +-
 test/test_logs/test_log-disabled.yml                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/test_custom/test_location-per-vhost.yml b/test/test_custom/test_location-per-vhost.yml
index dd46a21..676712c 100644
--- a/test/test_custom/test_location-per-vhost.yml
+++ b/test/test_custom/test_location-per-vhost.yml
@@ -27,4 +27,4 @@ services:
       - "83"
     environment:
       WEB_PORTS: "83"
-      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
+      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$$
diff --git a/test/test_custom/test_per-vhost.yml b/test/test_custom/test_per-vhost.yml
index 8813d5e..3680358 100644
--- a/test/test_custom/test_per-vhost.yml
+++ b/test/test_custom/test_per-vhost.yml
@@ -27,4 +27,4 @@ services:
       - "83"
     environment:
       WEB_PORTS: "83"
-      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
+      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$$
diff --git a/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml b/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
index b47236a..ba9d9ef 100644
--- a/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
+++ b/test/test_htpasswd/test_htpasswd-regex-virtual-host.yml
@@ -5,4 +5,4 @@ services:
       - "80"
     environment:
       WEB_PORTS: "80"
-      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$
+      VIRTUAL_HOST: ~^regex.*\.nginx-proxy\.example$$
diff --git a/test/test_logs/test_log-disabled.yml b/test/test_logs/test_log-disabled.yml
index 9e116d7..14b8e8b 100644
--- a/test/test_logs/test_log-disabled.yml
+++ b/test/test_logs/test_log-disabled.yml
@@ -1,7 +1,7 @@
 services:
   nginx-proxy:
     environment:
-      DISABLE_ACCESS_LOGS: true
+      DISABLE_ACCESS_LOGS: "true"
 
   web1:
     image: web

From c1f1c85aebda1fc154025e4d1156ddbfe6cd8fd7 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Fri, 31 Jan 2025 23:00:20 +0100
Subject: [PATCH 3/3] ci: standalone compose file for proxy-host-network-mode

This is to prevent the below error with docker-compose v1:

ERROR: for nginx-proxy  "host" network_mode is incompatible with port_bindings
---
 ...network-mode.yml => test_proxy-host-network-mode.base.yml} | 4 ++++
 1 file changed, 4 insertions(+)
 rename test/test_host-network-mode/{test_proxy-host-network-mode.yml => test_proxy-host-network-mode.base.yml} (76%)

diff --git a/test/test_host-network-mode/test_proxy-host-network-mode.yml b/test/test_host-network-mode/test_proxy-host-network-mode.base.yml
similarity index 76%
rename from test/test_host-network-mode/test_proxy-host-network-mode.yml
rename to test/test_host-network-mode/test_proxy-host-network-mode.base.yml
index 283dcf5..1917d06 100644
--- a/test/test_host-network-mode/test_proxy-host-network-mode.yml
+++ b/test/test_host-network-mode/test_proxy-host-network-mode.base.yml
@@ -1,5 +1,9 @@
 services:
   nginx-proxy:
+    image: nginxproxy/nginx-proxy:test
+    container_name: nginx-proxy
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
     environment:
       HTTP_PORT: 8888
     network_mode: host