Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions scripts/start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ fi
INSTALLED_DOCKER_VERSION=$(docker version -f "{{.Server.Version}}")
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])))"
if [[ $INSTALLED_DOCKER_VERSION =~ $MINIMUM_REQUIRED_DOCKER_VERSION_REGEX ]]; then
if command -v gp version &> /dev/null; then
export GITPOD_ENV="true"
export USE_HTTPS="true"
else
export GITPOD_ENV="false"
fi
INSTALLED_DOCKER_COMPOSE_VERSION=$(docker compose version --short 2>/dev/null)
MINIMUM_REQUIRED_DOCKER_COMPOSE_VERSION_REGEX="^([2-9]|[1-9][0-9]+)\.*"
if [[ $INSTALLED_DOCKER_COMPOSE_VERSION =~ $MINIMUM_REQUIRED_DOCKER_COMPOSE_VERSION_REGEX ]]; then
if command -v gp version &> /dev/null; then
export GITPOD_ENV="true"
export USE_HTTPS="true"
else
export GITPOD_ENV="false"
fi

# Export the scheme
exportScheme
Expand Down Expand Up @@ -96,6 +99,7 @@ if [[ $INSTALLED_DOCKER_VERSION =~ $MINIMUM_REQUIRED_DOCKER_VERSION_REGEX ]]; th
fi

else
echo "$ERROR Docker compose versions < 2.x are not supported"
echo "$ERROR Docker versions < 20.10.13 are not supported"
fi
Comment on lines 101 to 106
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They should be under different "else" statements.


Expand Down
Loading