Merge pull request #1228 from openziti/fix-run-router

Fix run router
openziti · Jul 31, 2023 · e512c0a · e512c0a
2 parents 729404c + b37e0f9
commit e512c0a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/quickstart/docker/image/run-router.sh b/quickstart/docker/image/run-router.sh
@@ -2,14 +2,8 @@
 
 . "${ZITI_SCRIPTS}/ziti-cli-functions.sh"
 
-# wait for the controller to come online
-_wait_for_controller
-
-# after coming online, give the controller just a second to ramp up in case running via docker compose
-sleep 1
-
 if [[ "${ZITI_CTRL_EDGE_ADVERTISED_ADDRESS-}" == "" ]]; then export ZITI_CTRL_EDGE_ADVERTISED_ADDRESS="ziti-edge-controller"; fi
-if [[ "${ZITI_CTRL_EDGE_ADVERTISED_PORT-}" == "" ]]; then export ZITI_CTRL_EDGE_ADVERTISED_PORT="3022"; fi
+if [[ "${ZITI_CTRL_EDGE_ADVERTISED_PORT-}" == "" ]]; then export ZITI_CTRL_EDGE_ADVERTISED_PORT="1280"; fi
 if [[ "${ZITI_ROUTER_PORT-}" == "" ]]; then export ZITI_ROUTER_PORT="3022"; fi
 if [[ "${ZITI_ROUTER_ROLES}" == "" ]]; then export ZITI_ROUTER_ROLES="${ZITI_ROUTER_NAME}"; fi
 
@@ -20,6 +14,12 @@ fi
 
 . ${ZITI_HOME}/ziti.env
 
+# wait for the controller to come online
+_wait_for_controller
+
+# after coming online, give the controller just a second to ramp up in case running via docker compose
+sleep 1
+
 if [[ "${_ZITI_ROUTER_NAME}" != "" ]]; then
   export ZITI_ROUTER_NAME="${_ZITI_ROUTER_NAME}"
   echo "ZITI_ROUTER_NAME set to: ${ZITI_ROUTER_NAME}"