From 5cd0c625e72d74dfe8e61b86b38e54943b5805e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20B=C3=BCrk?= <stefan@buerk.tech>
Date: Fri, 5 Aug 2022 17:47:03 +0200
Subject: [PATCH] [TASK] Remove docker-compose v1 enforce check from
runTests.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Quite some issues with docker-compose v2 have been fixed
We'll now try to use it again and remove a v1 restriction
in `Build/Scripts/runTests.sh`.
Resolves: #98086
Releases: main, 11.5, 10.4
Change-Id: I7e4ff82df374db33ba42db0e0d1483f6320ba9ea
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/75374
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Jochen <rothjochen@gmail.com>
Tested-by: André Buchmann <andy.schliesser@gmail.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Jochen <rothjochen@gmail.com>
Reviewed-by: André Buchmann <andy.schliesser@gmail.com>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
Build/Scripts/runTests.sh | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh
index 2bedc18b6f73..5a0b0e2cbd60 100755
--- a/Build/Scripts/runTests.sh
+++ b/Build/Scripts/runTests.sh
@@ -301,16 +301,6 @@ if ! type "docker-compose" > /dev/null; then
exit 1
fi
-# docker-compose v2 is enabled by docker for mac as experimental feature without
-# asking the user. v2 is currently broken. Detect the version and error out.
-DOCKER_COMPOSE_VERSION=$(docker-compose version --short)
-DOCKER_COMPOSE_MAJOR=$(echo "$DOCKER_COMPOSE_VERSION" | cut -d'.' -f1 | tr -d 'v')
-if [ "$DOCKER_COMPOSE_MAJOR" -gt "1" ]; then
- echo "docker-compose $DOCKER_COMPOSE_VERSION is currently broken and not supported by runTests.sh."
- echo "If you are running Docker Desktop for MacOS/Windows disable 'Use Docker Compose V2' (Preferences > General)"
- exit 1
-fi
-
# Go to the directory this script is located, so everything else is relative
# to this dir, no matter from where this script is called.
THIS_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
--
GitLab