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: