Skip to content

Commit f25ea60

Browse files
authored
Merge pull request #533 from kool-dev/fix-docker-composer-check
fix docker composer v2 check
2 parents a811231 + d1d4307 commit f25ea60

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

install.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,14 @@ do_install () {
8484
exit
8585
fi
8686

87-
composeVersion=$(docker compose version || true)
88-
if [[ ! "$composeVersion" == *"Docker Compose version v2"* ]]; then
89-
builtin echo -e "${start_error}We could not identify Composer V2 installed.${end_error}"
90-
builtin echo -e "Please make sure you are running an updated Docker version that includes Compose V2:"
87+
composeVersion=$(docker compose version --short 2>/dev/null || true)
88+
composeMajor="${composeVersion%%.*}"
89+
composeMajor="${composeMajor#v}"
90+
if [[ -z "$composeMajor" ]] || ! [[ "$composeMajor" =~ ^[0-9]+$ ]] || (( composeMajor < 2 )); then
91+
builtin echo -e "${start_error}We could not identify Docker Compose v2 or newer installed.${end_error}"
92+
builtin echo -e "Please make sure you are running an updated Docker version that includes Compose V2 (or newer):"
9193
builtin echo -e " Official Docker installation documentation: https://docs.docker.com/get-docker/"
92-
builtin echo -e " Official Docker Compose V2 documentation: https://docs.docker.com/compose/reference/"
94+
builtin echo -e " Official Docker Compose documentation: https://docs.docker.com/compose/reference/"
9395
exit
9496
fi
9597

0 commit comments

Comments
 (0)