Merge pull request #1807 from openziti/quickstart-healthcheck-normal-vars

add healthcheck and normalize vars

quickstart/docker/all-in-one/compose.override.yml

@@ -25,12 +25,14 @@ services:
       GOFLAGS: "-tags=quickstart,manual"
       GOCACHE: /.cache/go-build
       GOPATH: /go
-      ZITI_PWD:
-      ZITI_CTRL_EDGE_ADVERTISED_ADDRESS: ${EXTERNAL_DNS:-quickstart}
+      ZITI_PWD:  # default "admin"
+      ZITI_CTRL_ADVERTISED_ADDRESS: ${EXTERNAL_DNS:-quickstart}
+      ZITI_CTRL_EDGE_ADVERTISED_ADDRESS: ${EXTERNAL_DNS:-quickstart}  # deprecated by ZITI_CTRL_ADVERTISED_ADDRESS
+      ZITI_CTRL_ADVERTISED_PORT: ${ZITI_CTRL_ADVERTISED_PORT:-1280}
+      ZITI_CTRL_EDGE_ADVERTISED_PORT: ${ZITI_CTRL_ADVERTISED_PORT:-1280}  # deprecated by ZITI_CTRL_ADVERTISED_PORT
       ZITI_ROUTER_ADVERTISED_ADDRESS: ${EXTERNAL_DNS:-quickstart}
-      ZITI_CTRL_EDGE_ADVERTISED_PORT:
+      ZITI_ROUTER_PORT: ${ZITI_ROUTER_PORT:-3022}
       ZITI_ROUTER_NAME: ${ZITI_ROUTER_NAME:-quickstart-router}
-      ZITI_ROUTER_PORT:
     command: go test -v ./ziti/cmd/edge/...
       
   wait-for-login:
@@ -39,6 +41,10 @@ services:
     image: ${ZITI_QUICK_IMAGE:-docker.io/openziti/ziti-cli}:${ZITI_QUICK_TAG:-latest}
     networks:
       - quickstart
+    # run as the same user as the host, so we can write in ~/.config/ziti
+    user: ${ZIGGY_UID:-1000}
+    environment:
+      HOME: /home/ziggy
     volumes:
       - ${ZITI_HOME:-ziti_home}:/home/ziggy
     entrypoint:
@@ -48,7 +54,7 @@ services:
         set -o pipefail
         ATTEMPTS=10
         DELAY=3
-        until !((ATTEMPTS)) || ziti $${@} &>/dev/null; do
+        until !((ATTEMPTS)) || ziti $${@}; do
           (( ATTEMPTS-- ))
           echo "Waiting for controller to start"
           sleep $${DELAY}
@@ -56,6 +62,6 @@ services:
         ziti $${@}
     command: >
       -- edge login
-      ${EXTERNAL_DNS:-quickstart}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}
+      ${EXTERNAL_DNS:-quickstart}:${ZITI_CTRL_ADVERTISED_PORT:-1280}
       -u ${ZITI_USER:-admin} -p ${ZITI_PWD:-admin}
       --ca /home/ziggy/quickstart/pki/root-ca/certs/root-ca.cert

quickstart/docker/all-in-one/compose.yml

@@ -21,7 +21,7 @@ services:
       - -euc
       - |
         ZITI_CMD+=" --ctrl-address ${EXTERNAL_DNS:-quickstart}"\
-        " --ctrl-port ${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}"\
+        " --ctrl-port ${ZITI_CTRL_ADVERTISED_PORT:-1280}"\
         " --router-address ${EXTERNAL_DNS:-quickstart}"\
         " --router-port ${ZITI_ROUTER_PORT:-3022}"\
         " --password ${ZITI_PWD:-admin}"
@@ -32,19 +32,34 @@ services:
     environment:
       HOME: /home/ziggy
       PFXLOG_NO_JSON: "${PFXLOG_NO_JSON:-true}"
+      ZITI_ROUTER_NAME: ${ZITI_ROUTER_NAME:-quickstart-router}
     volumes:
       # store the quickstart state in a named volume "ziti_home" or store the quickstart state on the Docker host in a
       # directory, ZITI_HOME 
       - ${ZITI_HOME:-ziti_home}:/home/ziggy
     ports:
-      - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}:${ZITI_CTRL_EDGE_ADVERTISED_PORT:-1280}
+      - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_CTRL_ADVERTISED_PORT:-1280}:${ZITI_CTRL_ADVERTISED_PORT:-1280}
       - ${ZITI_INTERFACE:-0.0.0.0}:${ZITI_ROUTER_PORT:-3022}:${ZITI_ROUTER_PORT:-3022}
+    expose:
+      - ${ZITI_CTRL_ADVERTISED_PORT:-1280}
+      - ${ZITI_ROUTER_PORT:-3022}
     depends_on:
-      initialize:
+      quickstart-init:
         condition: service_completed_successfully
+    healthcheck:
+      test:
+        - CMD
+        - ziti
+        - agent
+        - stats
+      interval: 3s
+      timeout: 3s
+      retries: 5
+      start_period: 30s
+
   # this service is used to initialize the ziti_home volume by setting the owner to the UID of the user running the
   # quickstart container
-  initialize:
+  quickstart-init:
     image: busybox
     command: chown -Rc ${ZIGGY_UID:-1000} /home/ziggy
     user: root
@@ -55,6 +70,14 @@ services:
       # directory, ZITI_HOME 
       - ${ZITI_HOME:-ziti_home}:/home/ziggy
 
+  # add a health check for the quickstart network
+  quickstart-check:
+    image: busybox
+    command: echo "Ziti is cooking"
+    depends_on:
+      quickstart:
+        condition: service_healthy
+
 # define a custom network so that we can also define a DNS alias for the quickstart container
 networks:
   quickstart: