Skip to content

Commit

Permalink
[TASK] Remove docker-compose v1 enforce check from runTests.sh
Browse files Browse the repository at this point in the history
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/+/75353
Tested-by: core-ci <typo3@b13.com>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
  • Loading branch information
sbuerk committed Aug 5, 2022
1 parent 34e8e51 commit 5b2be2c
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions Build/Scripts/runTests.sh
Expand Up @@ -322,16 +322,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)"
Expand Down

0 comments on commit 5b2be2c

Please sign in to comment.