laantungir/fips
1
0
Fork 0
mirror of https://github.com/jmcorgan/fips.git synced 2026-07-30 19:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have every suite compose file name the caller's test image

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
testing/acl-allowlist/docker-compose.yml
+1 -1
View File
@@ -20,7 +20,7 @@ networks:
x-fips-common: &fips-common x-fips-common: &fips-common
build: build:
context: ../docker context: ../docker
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
entrypoint: ["/usr/local/bin/entrypoint.sh"] entrypoint: ["/usr/local/bin/entrypoint.sh"]
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
testing/firewall/docker-compose.yml
+1 -1
View File
@@ -20,7 +20,7 @@ networks:
x-fips-common: &fips-common x-fips-common: &fips-common
build: build:
context: ../docker context: ../docker
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
entrypoint: ["/usr/local/bin/entrypoint.sh"] entrypoint: ["/usr/local/bin/entrypoint.sh"]
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
testing/nat/docker-compose.yml
+2 -2
View File
@@ -18,7 +18,7 @@ volumes:
relay-data: relay-data:
x-fips-common: &fips-common x-fips-common: &fips-common
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
devices: devices:
@@ -325,7 +325,7 @@ services:
ipv4_address: 172.31.10.51 ipv4_address: 172.31.10.51
stun-fault-shim: stun-fault-shim:
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
profiles: ["stun-faults"] profiles: ["stun-faults"]
container_name: fips-nat-stun-fault-shim${FIPS_CI_NAME_SUFFIX:-} container_name: fips-nat-stun-fault-shim${FIPS_CI_NAME_SUFFIX:-}
depends_on: depends_on:
testing/sidecar/docker-compose.yml
+2 -2
View File
@@ -14,7 +14,7 @@ networks:
services: services:
fips: fips:
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
hostname: fips-sidecar hostname: fips-sidecar
labels: labels:
- "com.corganlabs.fips-ci=1" - "com.corganlabs.fips-ci=1"
@@ -40,7 +40,7 @@ services:
ipv4_address: ${FIPS_IPV4:-172.20.1.20} ipv4_address: ${FIPS_IPV4:-172.20.1.20}
app: app:
image: fips-test-app:latest image: ${FIPS_TEST_APP_IMAGE:-fips-test-app:latest}
labels: labels:
- "com.corganlabs.fips-ci=1" - "com.corganlabs.fips-ci=1"
network_mode: "service:fips" network_mode: "service:fips"
testing/tor/directory-mode/docker-compose.yml
+2 -2
View File
@@ -16,7 +16,7 @@ networks:
services: services:
fips-a: fips-a:
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
devices: devices:
@@ -36,7 +36,7 @@ services:
dir-test: dir-test:
fips-b: fips-b:
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
devices: devices:
testing/tor/socks5-outbound/docker-compose.yml
+2 -2
View File
@@ -24,7 +24,7 @@ services:
tor-test: tor-test:
fips-a: fips-a:
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
devices: devices:
@@ -45,7 +45,7 @@ services:
tor-test: tor-test:
fips-b: fips-b:
image: fips-test:latest image: ${FIPS_TEST_IMAGE:-fips-test:latest}
cap_add: cap_add:
- NET_ADMIN - NET_ADMIN
devices: devices: