From b1e8df28dadc099b66b39b3e3d6bfd53e61acb07 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Mon, 20 Jan 2025 16:20:35 +0100 Subject: [PATCH] Handle the case in which `podman compose` or `docker compose` fail Implements a TODO item that was in the script --- .ci/run_tests.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.ci/run_tests.sh b/.ci/run_tests.sh index cdc8d16c699..79b0782af9a 100755 --- a/.ci/run_tests.sh +++ b/.ci/run_tests.sh @@ -12,7 +12,13 @@ test -n "${DOCKER}" || { DOCKER_COMPOSE=$(command -v podman-compose docker-compose | head -1) test -n "${DOCKER_COMPOSE}" || { - DOCKER_COMPOSE="${DOCKER} compose" # TODO: check if supported + DOCKER_COMPOSE="${DOCKER} compose" + # check if supported + ${DOCKER_COMPOSE} > /dev/null || { + echo "Cannot find podman-compose or docker-compose, and '${DOCKER_COMPOSE}' fails" >&2 + echo "HINT: try installing podman-compose" >&2 + exit 1 + } } IMAGE_BUILD_DEPS=docker.io/qgis/qgis3-build-deps:latest