Commit 5cd0c625 authored by Stefan Bürk's avatar Stefan Bürk
Browse files

[TASK] Remove docker-compose v1 enforce check from runTests.sh

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's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Jochen's avatarJochen <rothjochen@gmail.com>
Tested-by: André Buchmann's avatarAndré Buchmann <andy.schliesser@gmail.com>
Tested-by: Stefan Bürk's avatarStefan Bürk <stefan@buerk.tech>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Jochen's avatarJochen <rothjochen@gmail.com>
Reviewed-by: André Buchmann's avatarAndré Buchmann <andy.schliesser@gmail.com>
Reviewed-by: Stefan Bürk's avatarStefan Bürk <stefan@buerk.tech>
parent fb6cb83e
......@@ -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)"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment