diff --git a/CHANGELOG.md b/CHANGELOG.md index a0f094e4..1356a9d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ FEATURE: Resource count limits now include `share_frontends` to limit the number of frontends that are allowed to make connections to a share (https://github.com/openziti/zrok/issues/650) +FIX: use controller config spec v4 in the Docker instance + ## v0.4.31 FEATURE: New "limits classes" limits implementation (https://github.com/openziti/zrok/issues/606). This new feature allows for extensive limits customization on a per-user basis, with fallback to the global defaults in the controller configuration. diff --git a/docker/compose/zrok-instance/README.md b/docker/compose/zrok-instance/README.md index 1cdf2b02..8d56d167 100644 --- a/docker/compose/zrok-instance/README.md +++ b/docker/compose/zrok-instance/README.md @@ -90,9 +90,9 @@ ZROK_OAUTH_GOOGLE_CLIENT_ID=abcd1234 ZROK_OAUTH_GOOGLE_CLIENT_SECRET=abcd1234 # zrok version, e.g., 1.0.0 -ZROK_IMAGE_TAG=latest +ZROK_CLI_TAG=latest # ziti version, e.g., 1.0.0 -ZITI_IMAGE_TAG=latest +ZITI_CLI_TAG=latest ``` ### Start the Docker Compose Project diff --git a/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst b/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst index 389f4bce..cbdfe639 100644 --- a/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst +++ b/docker/compose/zrok-instance/zrok-controller-config.yml.envsubst @@ -4,7 +4,7 @@ # /___|_| \___/|_|\_\ # controller configuration -v: 3 +v: 4 admin: # generate these admin tokens from a source of randomness, e.g. # LC_ALL=C tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c32