From 6bad0fbac7ec8f6dc250ee5d4deaa22d62cd9fba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan@buerk.tech>
Date: Tue, 7 May 2024 12:13:20 +0200
Subject: [PATCH] [TASK] Streamline container binary chain (#1279)

First iteration of the `Build/Scripts/runTests.sh` supporting
`docker` and `podman` introduced a switch for direct usage in
local environments while keeping `docker` as strong default.

This change removes the hardcoded default for local and ci runs
and introduces a detection of available binaries, prefering the
`podman` over `docker` if both are installed on the host and no
specific binary selected using `-b <container-bin>`.

If no specific binary is provided, the detection chain is now:

* podman
* docker

Default binary variables are removed due to beeing obsolete now.

Resolves: #1148
---
 Build/Scripts/runTests.sh | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index 58e71f5..3b1fb29 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -280,7 +280,7 @@ Examples:
 EOF
 }
 
-# Test if docker exists, else exit out with error
+# Test if at least one of the supported container binaries exists, else exit out with error
 if ! type "docker" >/dev/null 2>&1 && ! type "podman" >/dev/null 2>&1; then
     echo "This script relies on docker or podman. Please install at least one of them" >&2
     exit 1
@@ -306,8 +306,6 @@ PHPUNIT_RANDOM=""
 CGLCHECK_DRY_RUN=0
 DATABASE_DRIVER=""
 CONTAINER_BIN=""
-DEFAULT_CONTAINER_BIN="docker"
-DEFAULT_CI_CONTAINER_BIN="docker"
 COMPOSER_ROOT_VERSION="3.0.x-dev"
 CONTAINER_INTERACTIVE="-it --init"
 HOST_UID=$(id -u)
@@ -407,16 +405,16 @@ handleDbmsOptions
 if [ "${CI}" == "true" ]; then
     IS_CORE_CI=1
     CONTAINER_INTERACTIVE=""
-    # set default ci container binary, if not set using "-b" option
-    if [ "${CONTAINER_BIN}" == "" ]; then
-        CONTAINER_BIN="${DEFAULT_CI_CONTAINER_BIN}"
-    fi
     CI_PARAMS="--pull=never"
 fi
 
-# set default container binary, if not set using "-b" option
-if [ "${CONTAINER_BIN}" == "" ]; then
-    CONTAINER_BIN="${DEFAULT_CONTAINER_BIN}"
+# determine default container binary to use: 1. podman 2. docker
+if [[ -z "${CONTAINER_BIN}" ]]; then
+    if type "podman" >/dev/null 2>&1; then
+        CONTAINER_BIN="podman"
+    elif type "docker" >/dev/null 2>&1; then
+        CONTAINER_BIN="docker"
+    fi
 fi
 
 if [ $(uname) != "Darwin" ] && [ "${CONTAINER_BIN}" == "docker" ]; then