Merge pull request #2584 from pini-gh/pini-debian-docker

test: support docker-compose v1 & debian bookworm

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")

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$$

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$$

test/test_host-network-mode/test_proxy-host-network-mode.yml → 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

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$$

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