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

Merge pull request #670 from openziti/docker-updates

Browse Source 
small updates to docker compose
This commit is contained in:
dovholuknf
2022-04-08 09:33:23 -04:00
committed by GitHub
parent fc10cb63da 251806d43b
commit 2066e48c4b
4 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstart/docker/README.md
+2 -3
View File
@@ -22,6 +22,5 @@ Build Docker Image For Publication
2.
Push Docker Image to dockerhub
------------------
1. retag the image locally to match the expected version: `docker push openziti/quickstart:0.19.3`
1. push the latest: `docker push openziti/quickstart`
1. push the versioned tag: `docker push openziti/quickstart:0.19.3`
1. source `./image/ziti-cli-functions.sh`
1. just run `./pushLatestDocker.sh`
quickstart/docker/attach.container.to.compose.sh
+1 -1
View File
@@ -1 +1 @@
docker run --network docker_zitiblue --rm -it openziti/quickstart /bin/bash
docker run -v docker_ziti-fs:/openziti --network docker_zitiblue --rm -it openziti/quickstart /bin/bash
quickstart/docker/image/run-router.sh
+10 -6
View File
@@ -42,12 +42,16 @@ if [[ "$1" == "private" ]]; then
fi
echo "---------- Creating edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
"${ZITI_BIN_DIR}/ziti" edge delete edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}"
"${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t -a "${ZITI_EDGE_ROUTER_ROLES}"
sleep 1
echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
"${ZITI_BIN_DIR}/ziti-router" enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt"
echo ""
found=$(ziti edge list edge-routers 'name = "'"${ZITI_EDGE_ROUTER_HOSTNAME}"'"' | grep -c "${ZITI_EDGE_ROUTER_HOSTNAME}")
if [[ found -gt 0 ]]; then
echo "---------- Found existing edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
else
"${ZITI_BIN_DIR}/ziti" edge create edge-router "${ZITI_EDGE_ROUTER_HOSTNAME}" -o "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt" -t -a "${ZITI_EDGE_ROUTER_ROLES}"
sleep 1
echo "---------- Enrolling edge-router ${ZITI_EDGE_ROUTER_HOSTNAME}...."
"${ZITI_BIN_DIR}/ziti-router" enroll "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.yaml" --jwt "${ZITI_HOME}/${ZITI_EDGE_ROUTER_HOSTNAME}.jwt"
echo ""
fi
"${ZITI_BIN_DIR}/ziti-router" run "${ZITI_HOME}/${ZITI_EDGE_ROUTER_RAWNAME}.yaml" > "${ZITI_HOME}/ziti-${ZITI_EDGE_ROUTER_HOSTNAME}.log"
quickstart/docker/pushLatestDocker.sh
+1 -1
View File
@@ -16,7 +16,7 @@ if [ -d "${ZITI_BIN_ROOT}/image/ziti.ignore" ]; then
rm -rf "${ZITI_BIN_ROOT}/image/ziti.ignore"
fi
getLatestZiti
getZiti
mv "${ZITI_BIN_DIR}" "${SCRIPT_DIR}/image/ziti.ignore/"
docker build "${SCRIPT_DIR}/image" -t openziti/quickstart