g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

master
QMK Bot 2023-01-14 02:25:42 +00:00
parent 6f575fb23b 3f2cbc9e68
commit 5873fbe569
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/docker_build.sh
View File

@ -20,13 +20,13 @@ if [ $# -gt 1 ]; then
fi fi
# Allow $RUNTIME to be overridden by the user as an environment variable # 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 none are found error out
if [ -z "$RUNTIME" ]; then if [ -z "$RUNTIME" ]; then
if command -v docker >/dev/null 2>&1; then if command -v podman >/dev/null 2>&1; then
RUNTIME="docker"
elif command -v podman >/dev/null 2>&1; then
RUNTIME="podman" RUNTIME="podman"
elif command -v docker >/dev/null 2>&1; then
RUNTIME="docker"
else else
errcho "Error: no compatible container runtime found." errcho "Error: no compatible container runtime found."
errcho "Either podman or docker are required." errcho "Either podman or docker are required."

8
util/docker_cmd.sh
View File

@ -16,13 +16,13 @@ for arg; do
done done
# Allow $RUNTIME to be overridden by the user as an environment variable # 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 none are found error out
if [ -z "$RUNTIME" ]; then if [ -z "$RUNTIME" ]; then
if command -v docker >/dev/null 2>&1; then if command -v podman >/dev/null 2>&1; then
RUNTIME="docker"
elif command -v podman >/dev/null 2>&1; then
RUNTIME="podman" RUNTIME="podman"
elif command -v docker >/dev/null 2>&1; then
RUNTIME="docker"
else else
errcho "Error: no compatible container runtime found." errcho "Error: no compatible container runtime found."
errcho "Either podman or docker are required." errcho "Either podman or docker are required."