diff --git a/ci/build_image.sh b/ci/build_image.sh index a49cc40..f2ca1a5 100755 --- a/ci/build_image.sh +++ b/ci/build_image.sh @@ -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 diff --git a/ci/publish.sh b/ci/publish.sh index b709358..70124f9 100755 --- a/ci/publish.sh +++ b/ci/publish.sh @@ -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 diff --git a/ci/save_image.sh b/ci/save_image.sh index ecfdc4b..2d3d81e 100755 --- a/ci/save_image.sh +++ b/ci/save_image.sh @@ -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