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.
This commit is contained in:
Johnathan Corgan
2026-07-26 15:38:28 +00:00
parent cbbdf2c13c
commit a718cef8ce
6 changed files with 10 additions and 10 deletions
@@ -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:
@@ -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: