Skip to content

Commit c2f7312

Browse files
committed
OZ-331: Add a validation step for minimum docker compose version
1 parent 7ab7959 commit c2f7312

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

scripts/start.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,15 @@ fi
4646
INSTALLED_DOCKER_VERSION=$(docker version -f "{{.Server.Version}}")
4747
MINIMUM_REQUIRED_DOCKER_VERSION_REGEX="^((([2-9][1-9]|[3-9][0]|[0-9]{3,}).*)|(20\.([0-9]{3,}|[1-9][1-9]|[2-9][0]).*)|(20\.10\.([0-9]{3,}|[2-9][0-9]|[1][3-9])))"
4848
if [[ $INSTALLED_DOCKER_VERSION =~ $MINIMUM_REQUIRED_DOCKER_VERSION_REGEX ]]; then
49-
if command -v gp version &> /dev/null; then
50-
export GITPOD_ENV="true"
51-
export USE_HTTPS="true"
52-
else
53-
export GITPOD_ENV="false"
54-
fi
49+
INSTALLED_DOCKER_COMPOSE_VERSION=$(docker compose version --short 2>/dev/null)
50+
MINIMUM_REQUIRED_DOCKER_COMPOSE_VERSION_REGEX="^([2-9]|[1-9][0-9]+)\.*"
51+
if [[ $INSTALLED_DOCKER_COMPOSE_VERSION =~ $MINIMUM_REQUIRED_DOCKER_COMPOSE_VERSION_REGEX ]]; then
52+
if command -v gp version &> /dev/null; then
53+
export GITPOD_ENV="true"
54+
export USE_HTTPS="true"
55+
else
56+
export GITPOD_ENV="false"
57+
fi
5558

5659
# Export the scheme
5760
exportScheme
@@ -96,6 +99,7 @@ if [[ $INSTALLED_DOCKER_VERSION =~ $MINIMUM_REQUIRED_DOCKER_VERSION_REGEX ]]; th
9699
fi
97100

98101
else
102+
echo "$ERROR Docker compose versions < 2.x are not supported"
99103
echo "$ERROR Docker versions < 20.10.13 are not supported"
100104
fi
101105

0 commit comments

Comments
 (0)