Skip to content

Commit

Permalink
Merge pull request #692 from openziti/docker-bump-ziti-cli
Browse files Browse the repository at this point in the history
update ziti CLI version in zrok CLI
  • Loading branch information
qrkourier authored Jul 8, 2024
2 parents 920c598 + a009507 commit 187c06a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 6 deletions.
15 changes: 15 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: 2
updates:
# bump the ziti CLI version that is built into the zrok CLI image
- package-ecosystem: docker
directory: "/docker/images/zrok"
schedule:
interval: weekly
open-pull-requests-limit: 20
groups:
all:
applies-to: version-updates
update-types:
- "major"
- "minor"
- "patch"
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

## v0.4.35

FEATURE: Closed permission mode for Docker and Linux private shares

CHANGE: add example in ./etc/caddy to set X-Real-IP header to public share client IP

FEATURE: Closed permission mode for Docker and Linux private shares
CHANGE: auto-update the ziti CLI version that is built in to the openziti/zrok container image

CHANGE: Docker examples set HOME to enable running CLI commands in the container

Expand Down
9 changes: 4 additions & 5 deletions docker/images/zrok/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# this builds docker.io/openziti/zrok
ARG ZITI_CLI_TAG="1.0.0"
ARG ZITI_CLI_IMAGE="docker.io/openziti/ziti-cli"

FROM ${ZITI_CLI_IMAGE}:${ZITI_CLI_TAG}
FROM docker.io/openziti/ziti-cli:1.1.4

ARG ARTIFACTS_DIR=./dist
ARG DOCKER_BUILD_DIR=.
Expand All @@ -16,7 +13,9 @@ LABEL name="openziti/zrok" \
maintainer="[email protected]" \
vendor="NetFoundry" \
summary="Run the zrok CLI" \
description="Run the zrok CLI"
description="Run the zrok CLI" \
org.opencontainers.image.description="Run the zrok CLI" \
org.opencontainers.image.source="https://github.com/openziti/zrok"

USER root

Expand Down

0 comments on commit 187c06a

Please sign in to comment.