From 6a5231e9620954497bd5669ea3a4a19db9b8ec2c Mon Sep 17 00:00:00 2001 From: Tom van Dijk <18gatenmaker6@gmail.com> Date: Thu, 15 May 2025 16:55:42 +0200 Subject: [PATCH] build: allow choice of container runtime --- docker/build.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/docker/build.sh b/docker/build.sh index e64832bc..9704e22b 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -22,18 +22,20 @@ cleanup () { trap cleanup EXIT -declare oci_cmd +declare OCI_CMD -if whereis podman >/dev/null; then - oci_cmd=podman -elif whereis docker >/dev/null; then - oci_cmd=docker -else - echo "No container engine (docker/podman) found!" - exit 2 +if [ "x${OCI_CMD:-}" = "x" ]; then + if whereis docker >/dev/null; then + OCI_CMD=docker + elif whereis podman >/dev/null; then + OCI_CMD=podman + else + echo "No container engine (docker/podman) found!" + exit 2 + fi fi -"$oci_cmd" build -t isle "$SRCDIR/docker" +"$OCI_CMD" build -t isle "$SRCDIR/docker" mkdir -p result rm -rf result/* @@ -42,7 +44,7 @@ if [[ "x${JOBS:-}" == "x" ]]; then JOBS=$(nproc) fi -"$oci_cmd" run -it \ +"$OCI_CMD" run -it \ -e CMAKE_FLAGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo" \ -v "$SRCDIR":/isle:rw \ -e JOBS="$JOBS" \