From c346e33db3406c05a90cdade883f4cf9a28e3d37 Mon Sep 17 00:00:00 2001
From: dovholuknf <46322585+dovholuknf@users.noreply.github.com>
Date: Thu, 10 Feb 2022 12:37:00 -0500
Subject: [PATCH] allow override of ZITI_BIN_DIR. add an env file that's all
 localhost for docker compose

---
 quickstart/docker/all.localhost.env           | 3 +++
 quickstart/docker/image/ziti-cli-functions.sh | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 quickstart/docker/all.localhost.env

diff --git a/quickstart/docker/all.localhost.env b/quickstart/docker/all.localhost.env
new file mode 100644
index 000000000..482f78eb9
--- /dev/null
+++ b/quickstart/docker/all.localhost.env
@@ -0,0 +1,3 @@
+ZITI_CONTROLLER_RAWNAME=localhost
+ZITI_EDGE_CONTROLLER_RAWNAME=localhost
+ZITI_ZAC_RAWNAME=localhost
diff --git a/quickstart/docker/image/ziti-cli-functions.sh b/quickstart/docker/image/ziti-cli-functions.sh
index 75d223298..9ac9f7192 100755
--- a/quickstart/docker/image/ziti-cli-functions.sh
+++ b/quickstart/docker/image/ziti-cli-functions.sh
@@ -171,7 +171,7 @@ function getLatestZiti {
     return 1
   fi
 
-  export ZITI_BIN_DIR="${ziti_bin_root}/ziti-${ZITI_BINARIES_VERSION}"
+  if [[ "${ZITI_BIN_DIR-}" == "" ]]; then export ZITI_BIN_DIR="${ziti_bin_root}/ziti-${ZITI_BINARIES_VERSION}"; else echo "Using ZITI_BIN_DIR: ${ZITI_BIN_DIR}"; fi
 
   ZITI_BINARIES_FILE_ABSPATH="${ZITI_HOME-}/ziti-bin/${ZITI_BINARIES_FILE}"
   if ! test -f "${ZITI_BINARIES_FILE_ABSPATH}"; then
@@ -855,7 +855,7 @@ cat "${ZITI_PKI_OS_SPECIFIC}/${ZITI_SIGNING_INTERMEDIATE_NAME}/certs/${ZITI_SIGN
 echo -e "wrote CA file to: $(BLUE "${ZITI_PKI_OS_SPECIFIC}/cas.pem")"
 
 output_file="${ZITI_HOME}/${controller_name}.yaml"
-"${ZITI_BIN_DIR}/ziti" create config controller > "${output_file}"
+"${ZITI_BIN_DIR}/ziti" create config controller --ctrlListener 0.0.0.0:1280 > "${output_file}"
 
 echo -e "Controller configuration file written to: $(BLUE "${output_file}")"
 }