From 8d9b8e5e5bdcc26d2ac4e63b7da6d26182dc2db0 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Tue, 9 Jan 2024 18:09:33 -0500 Subject: [PATCH] Revert "try to enable external ip advertisement for minimal compose" This reverts commit 0b29e24a6556a0a2ccccd72781ec36e3547d9142. --- quickstart/docker/minimal/compose.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/quickstart/docker/minimal/compose.yml b/quickstart/docker/minimal/compose.yml index 5213485b8..1bf107fc0 100644 --- a/quickstart/docker/minimal/compose.yml +++ b/quickstart/docker/minimal/compose.yml @@ -23,13 +23,13 @@ services: # this allows other containers to use the external DNS name to reach the quickstart container inside the docker # network aliases: - - ${EXTERNAL_DNS:-${EXTERNAL_IP:-null}} + - ${EXTERNAL_DNS:-null} entrypoint: - bash - -euc - | - ZITI_CMD+=" --ctrl-address ${EXTERNAL_DNS:-${EXTERNAL_IP:-127.0.0.1}}"\ - " --router-address ${EXTERNAL_DNS:-${EXTERNAL_IP:-127.0.0.1}}"\ + ZITI_CMD+=" --ctrl-address ${EXTERNAL_DNS:-127.0.0.1}"\ + " --router-address ${EXTERNAL_DNS:-127.0.0.1}"\ " --password ${ZITI_PWD:-admin}" echo "DEBUG: run command is: ziti $${@} $${ZITI_CMD}" exec ziti "$${@}" $${ZITI_CMD} @@ -47,8 +47,4 @@ services: # define a custom network so that we can also define a DNS alias for the quickstart container networks: quickstart: - driver: bridge - driver_opts: - com.docker.network.bridge.enable_icc: "true" - com.docker.network.bridge.enable_ip_masquerade: "true" - com.docker.network.bridge.hairpin_mode: "true" + driver: bridge \ No newline at end of file