extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2025-06-23 19:22:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #848 from openziti/bwong365-depends-on-ziti-quickstart

Browse Source 
docker instance - wait for ziti
This commit is contained in:
Kenneth Bingham 2025-01-29 10:10:18 -05:00 committed by GitHub
commit 4ff058041e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## v0.4.47 ## v0.4.47
CHANGE: the Docker instance will wait for the ziti container healthy status (contribution from Ben Wong @bwong365 - https://github.com/openziti/zrok/pull/790)
CHANGE: Document solving the DNS propagation timeout for Docker instances that are using Caddy to manage the wildcard certificate. CHANGE: Document solving the DNS propagation timeout for Docker instances that are using Caddy to manage the wildcard certificate.
CHANGE: Add usage hint in `zrok config get --help` to clarify how to list all valid `configName` and their current values by running `zrok status`. CHANGE: Add usage hint in `zrok config get --help` to clarify how to list all valid `configName` and their current values by running `zrok status`.

4
docker/compose/zrok-instance/compose.yml
View File

@ -87,6 +87,8 @@ services:
depends_on: depends_on:
zrok-permissions: zrok-permissions:
condition: service_completed_successfully condition: service_completed_successfully
ziti-quickstart:
condition: service_healthy
build: build:
context: . context: .
dockerfile: ./zrok-controller.Dockerfile dockerfile: ./zrok-controller.Dockerfile
@ -121,6 +123,8 @@ services:
depends_on: depends_on:
zrok-permissions: zrok-permissions:
condition: service_completed_successfully condition: service_completed_successfully
ziti-quickstart:
condition: service_healthy
build: build:
context: . context: .
dockerfile: zrok-frontend.Dockerfile dockerfile: zrok-frontend.Dockerfile