From ffa1f75d1edb373a95284a28ad0d462974f030e4 Mon Sep 17 00:00:00 2001
From: Benjamin Pelletier <pelletierb@wing.com>
Date: Sat, 11 Jul 2026 06:28:15 +0000
Subject: [PATCH 1/2] Improve reliability of `make start-locally`

---
 build/dev/run_locally.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build/dev/run_locally.sh b/build/dev/run_locally.sh
index 8875861718..4b14bc2406 100755
--- a/build/dev/run_locally.sh
+++ b/build/dev/run_locally.sh
@@ -105,10 +105,18 @@ if [[ "$DC_COMMAND" == up* ]]; then
   check_and_connect() {
     local container=$1
     local network=$2
-    if docker ps --format '{{.Names}}' | grep -q "^${container}$"; then
+    if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
       if ! docker inspect "${container}" --format '{{json .NetworkSettings.Networks}}' | grep -q "\"${network}\""; then
         echo "Warning: Container ${container} is not connected to ${network}. Reconnecting and restarting so the entrypoint reapplies traffic shaping..."
-        docker network connect "${network}" "${container}"
+        local status
+        status=$(docker inspect --format '{{.State.Status}}' "${container}" 2>/dev/null || true)
+        if [ "$status" = "restarting" ] || [ "$status" = "running" ]; then
+          docker stop -t 2 "${container}" >/dev/null 2>&1 || true
+        fi
+        docker network connect "${network}" "${container}" || {
+          docker stop -t 2 "${container}" >/dev/null 2>&1 || true
+          docker network connect "${network}" "${container}"
+        }
         docker restart "${container}"
       fi
     fi

From 2b8b8d50046935eead6f11dfc5b1f5e5d635a1a1 Mon Sep 17 00:00:00 2001
From: Benjamin Pelletier <pelletierb@wing.com>
Date: Mon, 13 Jul 2026 17:19:10 +0000
Subject: [PATCH 2/2] Remove extra `docker stop`

---
 build/dev/run_locally.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/build/dev/run_locally.sh b/build/dev/run_locally.sh
index 4b14bc2406..383cbb75c1 100755
--- a/build/dev/run_locally.sh
+++ b/build/dev/run_locally.sh
@@ -108,11 +108,6 @@ if [[ "$DC_COMMAND" == up* ]]; then
     if docker ps -a --format '{{.Names}}' | grep -q "^${container}$"; then
       if ! docker inspect "${container}" --format '{{json .NetworkSettings.Networks}}' | grep -q "\"${network}\""; then
         echo "Warning: Container ${container} is not connected to ${network}. Reconnecting and restarting so the entrypoint reapplies traffic shaping..."
-        local status
-        status=$(docker inspect --format '{{.State.Status}}' "${container}" 2>/dev/null || true)
-        if [ "$status" = "restarting" ] || [ "$status" = "running" ]; then
-          docker stop -t 2 "${container}" >/dev/null 2>&1 || true
-        fi
         docker network connect "${network}" "${container}" || {
           docker stop -t 2 "${container}" >/dev/null 2>&1 || true
           docker network connect "${network}" "${container}"