From 94f95a82187896a60a33ca3fcd59ad5b8623c888 Mon Sep 17 00:00:00 2001
From: Matt Marangoni <matthewjmarangoni@gmail.com>
Date: Mon, 7 Jul 2025 13:43:53 -0400
Subject: [PATCH 1/3] fix(docker): container presence check failure, extra
 output

---
 images/chromium-headful/build-docker.sh | 2 +-
 shared/start-buildkit.sh                | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/images/chromium-headful/build-docker.sh b/images/chromium-headful/build-docker.sh
index c0d9485d..ff92a6f8 100755
--- a/images/chromium-headful/build-docker.sh
+++ b/images/chromium-headful/build-docker.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -ex -o pipefail
+set -e -o pipefail
 
 # Move to the script's directory so relative paths work regardless of the caller CWD
 SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
diff --git a/shared/start-buildkit.sh b/shared/start-buildkit.sh
index baca56c4..35037b5c 100755
--- a/shared/start-buildkit.sh
+++ b/shared/start-buildkit.sh
@@ -6,8 +6,7 @@
 export KRAFTKIT_BUILDKIT_HOST=docker-container://buildkit
 
 # Install container if not already installed.
-docker container inspect buildkit > /dev/null 2>&1
-if test $? -eq 0; then
+if test "$(docker ps --all --no-trunc --quiet --filter 'name=^buildkit$')"; then
     echo "Container 'buildkit' is already installed. Nothing to do."
 else
     echo "Installing 'buildkit' container ... "
@@ -17,9 +16,9 @@ fi
 
 test "$(docker container inspect -f '{{.State.Running}}' buildkit 2> /dev/null)" = "true"
 if test $? -eq 0; then
-    echo "Container 'buidlkitd' is already running. Nothing to do."
+    echo "Container 'buildkit' is already running. Nothing to do."
 else
     echo "Starting 'buildkit' container ... "
     docker start buildkit
     return $?
-fi
\ No newline at end of file
+fi

From 53fb79d4724e348c3aaf38e5f18a5f5a18c217fe Mon Sep 17 00:00:00 2001
From: Matt <211543057+matthewjmarangoni@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:04:19 -0400
Subject: [PATCH 2/3] Apply suggestion from @Sayan- fixing exit when container
 is stopped

Co-authored-by: Sayan <Sayan-@users.noreply.github.com>
---
 shared/start-buildkit.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/start-buildkit.sh b/shared/start-buildkit.sh
index 35037b5c..26015167 100755
--- a/shared/start-buildkit.sh
+++ b/shared/start-buildkit.sh
@@ -6,7 +6,7 @@
 export KRAFTKIT_BUILDKIT_HOST=docker-container://buildkit
 
 # Install container if not already installed.
-if test "$(docker ps --all --no-trunc --quiet --filter 'name=^buildkit$')"; then
+if [ -n "$(docker ps --all --no-trunc --quiet --filter 'name=^buildkit$')" ]; then
     echo "Container 'buildkit' is already installed. Nothing to do."
 else
     echo "Installing 'buildkit' container ... "

From 95ece899162f27683ba696e11eebca75fd2090fd Mon Sep 17 00:00:00 2001
From: Matt <211543057+matthewjmarangoni@users.noreply.github.com>
Date: Tue, 8 Jul 2025 12:05:46 -0400
Subject: [PATCH 3/3] Apply suggestion from @Sayan- propagating conversion of
 test to if conditional

Co-authored-by: Sayan <Sayan-@users.noreply.github.com>
---
 shared/start-buildkit.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shared/start-buildkit.sh b/shared/start-buildkit.sh
index 26015167..f7b67890 100755
--- a/shared/start-buildkit.sh
+++ b/shared/start-buildkit.sh
@@ -14,8 +14,7 @@ else
     return $?
 fi
 
-test "$(docker container inspect -f '{{.State.Running}}' buildkit 2> /dev/null)" = "true"
-if test $? -eq 0; then
+if [ "$(docker container inspect -f '{{.State.Running}}' buildkit 2> /dev/null)" = "true" ]; then
     echo "Container 'buildkit' is already running. Nothing to do."
 else
     echo "Starting 'buildkit' container ... "