summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2023-01-14 02:25:42 +0000
committerQMK Bot <hello@qmk.fm>2023-01-14 02:25:42 +0000
commit5873fbe5690a008548c258840b273d0712495ed4 (patch)
tree4b7954c201463f14728f252912d39c8557ba2246 /util
parent6f575fb23b27eba0369a2e0eb6b20207e07fb751 (diff)
parent3f2cbc9e68fa026ac14471e4ef15c9c349d78f38 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'util')
-rwxr-xr-xutil/docker_build.sh8
-rwxr-xr-xutil/docker_cmd.sh8
2 files changed, 8 insertions, 8 deletions
diff --git a/util/docker_build.sh b/util/docker_build.sh
index 7e10a4f76b..8dce387320 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 f3c4c7804f..a179cef732 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."