From e028a5ed52f835ef2fefcab0104ff047889e5470 Mon Sep 17 00:00:00 2001 From: Ethan Smith Date: Thu, 30 Jun 2022 13:38:59 -0700 Subject: [PATCH] ref: Replace regex with --short flag to get compose version (#1551) This flag works all the way back to compose 1.4, when the version argument was introduced. --- install/check-minimum-requirements.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/install/check-minimum-requirements.sh b/install/check-minimum-requirements.sh index 61484d3..dae17bd 100644 --- a/install/check-minimum-requirements.sh +++ b/install/check-minimum-requirements.sh @@ -12,9 +12,8 @@ if [[ "$(ver $DOCKER_VERSION)" -lt "$(ver $MIN_DOCKER_VERSION)" ]]; then fi echo "Found Docker version $DOCKER_VERSION" -# See https://github.com/getsentry/self-hosted/issues/1132#issuecomment-982823712 ff. for regex testing. -COMPOSE_VERSION=$($dc_base version | head -n1 | sed -E 's/^.* version:? v?([0-9.]+),?.*$/\1/') -if [[ "$(ver $COMPOSE_VERSION)" -lt "$(ver $MIN_COMPOSE_VERSION)" ]]; then +COMPOSE_VERSION=$($dc_base version --short) +if [[ "$(ver ${COMPOSE_VERSION//v})" -lt "$(ver $MIN_COMPOSE_VERSION)" ]]; then echo "FAIL: Expected minimum $dc_base version to be $MIN_COMPOSE_VERSION but found $COMPOSE_VERSION" exit 1 fi