From a718cef8ced6cf05f31dde808d899fb17ec6ee2f Mon Sep 17 00:00:00 2001
From: Johnathan Corgan <johnathan@corganlabs.com>
Date: Sun, 26 Jul 2026 15:38:28 +0000
Subject: [PATCH] Have every suite compose file name the caller's test image

Only the static family read FIPS_TEST_IMAGE; the firewall, ACL, nat,
sidecar and both Tor compose files named the shared mutable tag directly,
which is why the local CI runner has to retag its per-run image to that
name. They now take the same defaulted form the static file already uses,
so a harness run resolves the image it built and a bare hand run still
resolves the shared tag exactly as before.

Checked by rendering each file through `docker compose config` with the
variables set: every service resolves to the supplied name and none is
left naming the shared tag.
---
 testing/acl-allowlist/docker-compose.yml       | 2 +-
 testing/firewall/docker-compose.yml            | 2 +-
 testing/nat/docker-compose.yml                 | 4 ++--
 testing/sidecar/docker-compose.yml             | 4 ++--
 testing/tor/directory-mode/docker-compose.yml  | 4 ++--
 testing/tor/socks5-outbound/docker-compose.yml | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/testing/acl-allowlist/docker-compose.yml b/testing/acl-allowlist/docker-compose.yml
index 7d731d9..9bcb02e 100644
--- a/testing/acl-allowlist/docker-compose.yml
+++ b/testing/acl-allowlist/docker-compose.yml
@@ -20,7 +20,7 @@ networks:
 x-fips-common: &fips-common
   build:
     context: ../docker
-  image: fips-test:latest
+  image: ${FIPS_TEST_IMAGE:-fips-test:latest}
   entrypoint: ["/usr/local/bin/entrypoint.sh"]
   cap_add:
     - NET_ADMIN
diff --git a/testing/firewall/docker-compose.yml b/testing/firewall/docker-compose.yml
index 88110dd..9cedf41 100644
--- a/testing/firewall/docker-compose.yml
+++ b/testing/firewall/docker-compose.yml
@@ -20,7 +20,7 @@ networks:
 x-fips-common: &fips-common
   build:
     context: ../docker
-  image: fips-test:latest
+  image: ${FIPS_TEST_IMAGE:-fips-test:latest}
   entrypoint: ["/usr/local/bin/entrypoint.sh"]
   cap_add:
     - NET_ADMIN
diff --git a/testing/nat/docker-compose.yml b/testing/nat/docker-compose.yml
index a9a2c58..d428ecc 100644
--- a/testing/nat/docker-compose.yml
+++ b/testing/nat/docker-compose.yml
@@ -18,7 +18,7 @@ volumes:
   relay-data:
 
 x-fips-common: &fips-common
-  image: fips-test:latest
+  image: ${FIPS_TEST_IMAGE:-fips-test:latest}
   cap_add:
     - NET_ADMIN
   devices:
@@ -325,7 +325,7 @@ services:
         ipv4_address: 172.31.10.51
 
   stun-fault-shim:
-    image: fips-test:latest
+    image: ${FIPS_TEST_IMAGE:-fips-test:latest}
     profiles: ["stun-faults"]
     container_name: fips-nat-stun-fault-shim${FIPS_CI_NAME_SUFFIX:-}
     depends_on:
diff --git a/testing/sidecar/docker-compose.yml b/testing/sidecar/docker-compose.yml
index 801da5b..e7dded2 100644
--- a/testing/sidecar/docker-compose.yml
+++ b/testing/sidecar/docker-compose.yml
@@ -14,7 +14,7 @@ networks:
 
 services:
   fips:
-    image: fips-test:latest
+    image: ${FIPS_TEST_IMAGE:-fips-test:latest}
     hostname: fips-sidecar
     labels:
       - "com.corganlabs.fips-ci=1"
@@ -40,7 +40,7 @@ services:
         ipv4_address: ${FIPS_IPV4:-172.20.1.20}
 
   app:
-    image: fips-test-app:latest
+    image: ${FIPS_TEST_APP_IMAGE:-fips-test-app:latest}
     labels:
       - "com.corganlabs.fips-ci=1"
     network_mode: "service:fips"
diff --git a/testing/tor/directory-mode/docker-compose.yml b/testing/tor/directory-mode/docker-compose.yml
index 9b09c64..5e9f874 100644
--- a/testing/tor/directory-mode/docker-compose.yml
+++ b/testing/tor/directory-mode/docker-compose.yml
@@ -16,7 +16,7 @@ networks:
 
 services:
   fips-a:
-    image: fips-test:latest
+    image: ${FIPS_TEST_IMAGE:-fips-test:latest}
     cap_add:
       - NET_ADMIN
     devices:
@@ -36,7 +36,7 @@ services:
       dir-test:
 
   fips-b:
-    image: fips-test:latest
+    image: ${FIPS_TEST_IMAGE:-fips-test:latest}
     cap_add:
       - NET_ADMIN
     devices:
diff --git a/testing/tor/socks5-outbound/docker-compose.yml b/testing/tor/socks5-outbound/docker-compose.yml
index 58baa5e..4bb64ae 100644
--- a/testing/tor/socks5-outbound/docker-compose.yml
+++ b/testing/tor/socks5-outbound/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       tor-test:
 
   fips-a:
-    image: fips-test:latest
+    image: ${FIPS_TEST_IMAGE:-fips-test:latest}
     cap_add:
       - NET_ADMIN
     devices:
@@ -45,7 +45,7 @@ services:
       tor-test:
 
   fips-b:
-    image: fips-test:latest
+    image: ${FIPS_TEST_IMAGE:-fips-test:latest}
     cap_add:
       - NET_ADMIN
     devices: