Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ci/build_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,12 @@ fi
[ -d "$BUILD_CONTEXT" ] || die 5 "Build context '$BUILD_CONTEXT' not found"

runtime=
if command -v podman >/dev/null 2>&1 && podman info >/dev/null 2>&1
then
runtime=podman
elif command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1
if command -v docker >/dev/null 2>&1 && docker info >/dev/null 2>&1
then
runtime=docker
elif command -v podman >/dev/null 2>&1 && podman info >/dev/null 2>&1
then
runtime=podman
else
die 6 "No usable container runtime found"
fi
Expand Down
8 changes: 4 additions & 4 deletions ci/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,12 @@ tag=${1:-}
shift || true
[ "$#" -eq 0 ] || die 2 "Too many arguments"

if command -v podman >/dev/null 2>&1
then
runtime=podman
elif command -v docker >/dev/null 2>&1
if command -v docker >/dev/null 2>&1
then
runtime=docker
elif command -v podman >/dev/null 2>&1
then
runtime=podman
else
die 3 "No container runtime found"
fi
Expand Down
8 changes: 4 additions & 4 deletions ci/save_image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,12 @@ output_tar=${2:-}
shift 2 || true
[ "$#" -eq 0 ] || die 3 "Too many arguments"

if command -v podman >/dev/null 2>&1
then
runtime=podman
elif command -v docker >/dev/null 2>&1
if command -v docker >/dev/null 2>&1
then
runtime=docker
elif command -v podman >/dev/null 2>&1
then
runtime=podman
else
die 4 "No container runtime found"
fi
Expand Down
Loading