Merge pull request #2203 from openziti/allinone-controller-image

use the controller image so the console is available
openziti · Jul 26, 2024 · 79e430e · 79e430e
2 parents cefb322 + 8f662f4
commit 79e430e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/test-quickstart.yml b/.github/workflows/test-quickstart.yml
@@ -71,7 +71,9 @@ jobs:
         working-directory: ./quickstart/docker/all-in-one
         env:
           ZITI_GO_VERSION: ${{ steps.setup-go.outputs.go-version }}
-        run: docker compose --profile test run --rm quickstart-test
+        run: |
+          sleep 9  # wait a moment for the :local image to build
+          docker compose --profile test run --rm quickstart-test
 
       - name: Print debug info
         if: always()

diff --git a/quickstart/docker/all-in-one/compose.override.yml b/quickstart/docker/all-in-one/compose.override.yml
@@ -47,7 +47,7 @@ services:
   wait-for-login:
     profiles:
       - test
-    image: ${ZITI_CLI_IMAGE:-docker.io/openziti/ziti-cli}:${ZITI_CLI_TAG:-latest}
+    image: ${ZITI_CLI_IMAGE:-docker.io/openziti/ziti-controller}:${ZITI_CLI_TAG:-latest}
     networks:
       - quickstart
     # run as the same user as the host, so we can write in ~/.config/ziti

diff --git a/quickstart/docker/all-in-one/compose.yml b/quickstart/docker/all-in-one/compose.yml
@@ -1,6 +1,6 @@
 services:
   quickstart:
-    image: ${ZITI_CLI_IMAGE:-docker.io/openziti/ziti-cli}:${ZITI_CLI_TAG:-latest}
+    image: ${ZITI_CLI_IMAGE:-docker.io/openziti/ziti-controller}:${ZITI_CLI_TAG:-latest}
     restart: unless-stopped
     networks:
       quickstart: