From 4f57d54b8f2a88885a2c48c567a7b5d722d19da6 Mon Sep 17 00:00:00 2001
From: Ben Wong <42486090+bwong365@users.noreply.github.com>
Date: Sat, 9 Nov 2024 16:48:30 -0600
Subject: [PATCH 1/2] Add ziti-quickstart to the depends_on fields of
 zrok-controller and zrok-frontend

---
 docker/compose/zrok-instance/compose.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/compose/zrok-instance/compose.yml b/docker/compose/zrok-instance/compose.yml
index 80b9b143..4b553d63 100644
--- a/docker/compose/zrok-instance/compose.yml
+++ b/docker/compose/zrok-instance/compose.yml
@@ -87,6 +87,8 @@ services:
     depends_on:
         zrok-permissions:
           condition: service_completed_successfully
+        ziti-quickstart:
+          condition: service_healthy
     build:
       context: .
       dockerfile: ./zrok-controller.Dockerfile
@@ -121,6 +123,8 @@ services:
     depends_on:
         zrok-permissions:
           condition: service_completed_successfully
+        ziti-quickstart:
+          condition: service_healthy
     build:
       context: .
       dockerfile: zrok-frontend.Dockerfile

From 25d15c9baeb42a19dcf47d6fb8acee87e9bbbb6e Mon Sep 17 00:00:00 2001
From: Kenneth Bingham <kenneth.bingham@netfoundry.io>
Date: Wed, 29 Jan 2025 05:31:38 -0500
Subject: [PATCH 2/2] announce docker instance change

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2933da2d..a8a71640 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 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)
+
 ## v0.4.46
 
 FEATURE: Linux service template for systemd user units (https://github.com/openziti/zrok/pull/818)