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

continued minor edits

Browse Source
This commit is contained in:
dovholuknf
2021-04-23 15:36:03 -04:00
parent b0d7f60e78
commit b21fc476a9
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstart/docker/image/Dockerfile
+2
View File
@@ -15,6 +15,7 @@ COPY --chown=ziti ziti.ignore /usr/local/bin/
COPY --chown=ziti *.sh ./
RUN export ZITI_HOME=/openziti && \
export ENV_FILE=/openziti/ziti.env && \
export ZITI_NETWORK=ziti && \
export ZITI_CONTROLLER_RAWNAME=ziti-controller && \
export ZITI_EDGE_CONTROLLER_RAWNAME=ziti-edge-controller && \
@@ -27,3 +28,4 @@ RUN export ZITI_HOME=/openziti && \
/openziti/env.sh && \
echo "source /openziti/ziti.env" >> ~/.bashrc && \
echo "alias ziti-fabric='ziti-fabric -e \${fabric_controller_uri}'" >> ~/.bashrc
quickstart/ziti-cli-functions.sh
+15 -8
View File
@@ -104,6 +104,12 @@ function getLatestZiti {
echo "ERROR: ZITI_HOME is not set!"
exit 1
fi
if [[ "${ZITI_BIN_DIR}" == "" ]]; then
ZITI_BIN_DIR="${ZITI_HOME}/ziti-bin"
fi
if [[ "${ZITI_BIN}" == "" ]]; then
ZITI_BIN="${ZITI_BIN_DIR}/ziti"
fi
zitilatest=$(curl -s https://api.github.com/repos/openziti/ziti/releases/latest)
zitiversion=$(echo ${zitilatest} | jq -r '.tag_name')
@@ -121,14 +127,15 @@ function getLatestZiti {
echo -e 'UNZIPPING '"$(BLUE "${ZITI_HOME}/${zititgz}")"' into: '"$(GREEN ${ZITI_BIN_DIR})"
tar -xf "${ZITI_HOME}/${zititgz}" --directory "${ZITI_BIN_DIR}"
echo "Adding ${ZITI_BIN} to the path if necessary:"
if [[ "$(echo "$PATH"|grep -q "${ZITI_BIN}" && echo "yes")" == "yes" ]]; then
echo -e "$(GREEN "${ZITI_BIN}") is already on the path"
else
echo -e "adding $(RED "${ZITI_BIN}") to the path"
export PATH=$PATH:"${ZITI_BIN}"
if [[ "$2" == "yes" ]]; then
echo "Adding ${ZITI_BIN} to the path if necessary:"
if [[ "$(echo "$PATH"|grep -q "${ZITI_BIN}" && echo "yes")" == "yes" ]]; then
echo -e "$(GREEN "${ZITI_BIN}") is already on the path"
else
echo -e "adding $(RED "${ZITI_BIN}") to the path"
export PATH=$PATH:"${ZITI_BIN}"
fi
fi
}
function generatePki {
@@ -168,4 +175,4 @@ function checkControllerName {
return 1
fi
return 0
}
}