diff --git a/docker-compose.yml b/docker-compose.yml index 7852c70e2..01a7dc004 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -390,7 +390,7 @@ services: relay: environment: - PUBLIC_IP4_ADDR: 172.28.0.101 + PUBLIC_IP4_ADDR: ${PUBLIC_IP4_ADDR:-172.28.0.101} # PUBLIC_IP6_ADDR: fcff:3990:3990::101 LOWEST_PORT: 55555 HIGHEST_PORT: 55666 @@ -428,7 +428,7 @@ services: - 3478:3478/udp networks: app: - ipv4_address: 172.28.0.101 + ipv4_address: ${PUBLIC_IP4_ADDR:-172.28.0.101} # IPv6 is currently causing flakiness with GH actions and on our testbed. diff --git a/scripts/tests/relayed-curl-relay-restart.sh b/scripts/tests/relayed-curl-relay-restart.sh index 45fec9782..2f44456fe 100755 --- a/scripts/tests/relayed-curl-relay-restart.sh +++ b/scripts/tests/relayed-curl-relay-restart.sh @@ -8,6 +8,7 @@ install_iptables_drop_rules client_curl_resource "172.20.0.100/get" -docker compose restart relay # Restart relay +# Restart relay with new IP +PUBLIC_IP4_ADDR="172.28.0.102" docker compose up -d relay client_curl_resource "172.20.0.100/get" diff --git a/scripts/tests/relayed-dns-relay-restart.sh b/scripts/tests/relayed-dns-relay-restart.sh index 45fb05211..0725845d6 100755 --- a/scripts/tests/relayed-dns-relay-restart.sh +++ b/scripts/tests/relayed-dns-relay-restart.sh @@ -16,10 +16,9 @@ function run_test() { install_iptables_drop_rules -docker compose restart relay - run_test -docker compose restart relay +# Restart relay with new IP +PUBLIC_IP4_ADDR="172.28.0.102" docker compose up -d relay run_test