From 3f2cbc9e68fa026ac14471e4ef15c9c349d78f38 Mon Sep 17 00:00:00 2001 From: Renegade-Master Date: Sat, 14 Jan 2023 02:25:07 +0000 Subject: [PATCH] Pr/reorder docker podman check (#19561) --- util/docker_build.sh | 8 ++++---- util/docker_cmd.sh | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/util/docker_build.sh b/util/docker_build.sh index 7e10a4f76ba2..8dce38732064 100755 --- a/util/docker_build.sh +++ b/util/docker_build.sh @@ -20,13 +20,13 @@ if [ $# -gt 1 ]; then fi # Allow $RUNTIME to be overridden by the user as an environment variable -# Else check if either docker or podman exit and set them as runtime +# Else check if either podman or docker exit and set them as runtime # if none are found error out if [ -z "$RUNTIME" ]; then - if command -v docker >/dev/null 2>&1; then - RUNTIME="docker" - elif command -v podman >/dev/null 2>&1; then + if command -v podman >/dev/null 2>&1; then RUNTIME="podman" + elif command -v docker >/dev/null 2>&1; then + RUNTIME="docker" else errcho "Error: no compatible container runtime found." errcho "Either podman or docker are required." diff --git a/util/docker_cmd.sh b/util/docker_cmd.sh index f3c4c7804f82..a179cef732ce 100755 --- a/util/docker_cmd.sh +++ b/util/docker_cmd.sh @@ -16,13 +16,13 @@ for arg; do done # Allow $RUNTIME to be overridden by the user as an environment variable -# Else check if either docker or podman exit and set them as runtime +# Else check if either podman or docker exit and set them as runtime # if none are found error out if [ -z "$RUNTIME" ]; then - if command -v docker >/dev/null 2>&1; then - RUNTIME="docker" - elif command -v podman >/dev/null 2>&1; then + if command -v podman >/dev/null 2>&1; then RUNTIME="podman" + elif command -v docker >/dev/null 2>&1; then + RUNTIME="docker" else errcho "Error: no compatible container runtime found." errcho "Either podman or docker are required."