From 818b4d8a3ec86d7cd0cc2d3a29784ca8fd8b9801 Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Wed, 25 Oct 2023 12:59:57 -0400
Subject: [PATCH] bump ziti cli version and install jq

---
 docker/images/zrok/Dockerfile | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/docker/images/zrok/Dockerfile b/docker/images/zrok/Dockerfile
index f9ff31fb5..161b2df3c 100644
--- a/docker/images/zrok/Dockerfile
+++ b/docker/images/zrok/Dockerfile
@@ -1,7 +1,8 @@
 # this builds docker.io/openziti/zrok
-FROM docker.io/openziti/ziti-cli:0.27.9
-# This build stage grabs artifacts that are copied into the final image.
-# It uses the same base as the final image to maximize docker cache hits.
+ARG ZITI_CLI_TAG="0.30.5"
+ARG ZITI_CLI_IMAGE="docker.io/openziti/ziti-cli"
+# this builds docker.io/openziti/ziti-controller
+FROM ${ZITI_CLI_IMAGE}:${ZITI_CLI_TAG}
 
 ARG ARTIFACTS_DIR=./dist
 ARG DOCKER_BUILD_DIR=.
@@ -19,6 +20,11 @@ LABEL name="openziti/zrok" \
 
 USER root
 
+### install packages (jq introduced in source image in next release 0.30.6)
+RUN   INSTALL_PKGS="jq" && \
+      microdnf -y update --setopt=install_weak_deps=0 --setopt=tsflags=nodocs && \
+      microdnf -y install --setopt=install_weak_deps=0 --setopt=tsflags=nodocs ${INSTALL_PKGS}
+
 ### add licenses to this directory
 RUN mkdir -p -m0755 /licenses
 COPY ./LICENSE /licenses/apache.txt