Skip to content

Commit 19340bd

Browse files
fix(docker): container presence check failure, extra output
1 parent 5c71470 commit 19340bd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

images/chromium-headful/build-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
set -ex -o pipefail
2+
set -e -o pipefail
33

44
# Move to the script's directory so relative paths work regardless of the caller CWD
55
SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)

shared/start-buildkit.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
export KRAFTKIT_BUILDKIT_HOST=docker-container://buildkit
77

88
# Install container if not already installed.
9-
docker container inspect buildkit > /dev/null 2>&1
10-
if test $? -eq 0; then
9+
if test "$(docker ps --all --no-trunc --quiet --filter 'name=^buildkit$')"; then
1110
echo "Container 'buildkit' is already installed. Nothing to do."
1211
else
1312
echo "Installing 'buildkit' container ... "
@@ -17,9 +16,9 @@ fi
1716

1817
test "$(docker container inspect -f '{{.State.Running}}' buildkit 2> /dev/null)" = "true"
1918
if test $? -eq 0; then
20-
echo "Container 'buidlkitd' is already running. Nothing to do."
19+
echo "Container 'buildkit' is already running. Nothing to do."
2120
else
2221
echo "Starting 'buildkit' container ... "
2322
docker start buildkit
2423
return $?
25-
fi
24+
fi

0 commit comments

Comments
 (0)