From 7e1ce3bff6c3ed4bc7dafafebb0de56ae94057e3 Mon Sep 17 00:00:00 2001 From: Neill Magill Date: Thu, 18 Dec 2025 08:18:24 +0000 Subject: [PATCH] Make compatible with all docker compose versions above 2 The regular expression will now match on any version where: * the first number it 2 or greater * the first number is 1 followed by another number This should stop the script trying to fall back to the old `docker compose` command again when docker advances to version 6 or greater of composer. --- bin/moodle-docker-compose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/moodle-docker-compose b/bin/moodle-docker-compose index fb4ec7e9fcf..db51ef09878 100755 --- a/bin/moodle-docker-compose +++ b/bin/moodle-docker-compose @@ -23,7 +23,7 @@ export ASSETDIR="${basedir}/assets" # Test if we have docker compose v2 or v5, and keep quiet if we don't. ver=$(docker compose version > /dev/null 2>&1 && docker compose version --short) || true -if [[ $ver =~ ^v?[2|5] ]]; then +if [[ $ver =~ ^v?([2-9]|1[0-9]) ]]; then dockercompose="docker compose" else echo "Compose ${ver} is not available in Docker CLI, falling back to use docker-compose script"