gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-12 15:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow override of ZITI_BIN_DIR. add an env file that's all localhost for docker compose

Browse Source
This commit is contained in:
dovholuknf
2022-02-10 12:37:00 -05:00
parent ed6f92ef71
commit c346e33db3
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstart/docker/all.localhost.env
+3
View File
@@ -0,0 +1,3 @@
ZITI_CONTROLLER_RAWNAME=localhost
ZITI_EDGE_CONTROLLER_RAWNAME=localhost
ZITI_ZAC_RAWNAME=localhost
quickstart/docker/image/ziti-cli-functions.sh
+2 -2
View File
@@ -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}")"
}