Support new docker compose version (#1497)
Currently the Makefile and `quickstart.sh` expect the [deprecated docker compose V1](https://docs.docker.com/compose/#compose-v2-and-the-new-docker-compose-command) syntax, `docker-compose`. The new V2 syntax uses `docker compose` instead.
This commit is contained in:
@@ -75,13 +75,28 @@ echo " : Minimum required Docker version: $MIN_DOCKER_VER+"
|
||||
echo " : Minimum required docker-compose version: $MIN_COMPOSE_VER+"
|
||||
echo " : See the .travis build for the currently supported versions."
|
||||
echo " : Your docker system:"
|
||||
|
||||
if ! command -v docker-compose &> /dev/null; then
|
||||
DOCKER_COMPOSE_HYPHEN=false
|
||||
else
|
||||
DOCKER_COMPOSE_HYPHEN=true
|
||||
fi
|
||||
|
||||
function docker_compose_command () {
|
||||
if $DOCKER_COMPOSE_HYPHEN; then
|
||||
docker-compose $@
|
||||
else
|
||||
docker compose $@
|
||||
fi
|
||||
}
|
||||
|
||||
docker --version
|
||||
docker-compose --version
|
||||
docker_compose_command --version
|
||||
|
||||
# based on: http://stackoverflow.com/questions/16989598/bash-comparing-version-numbers
|
||||
function version { echo "$@" | tr -d 'v' | tr -cs '0-9.' '.' | awk -F. '{ printf("%03d%03d%03d\n", $1,$2,$3); }'; }
|
||||
|
||||
COMPOSE_VER=$(docker-compose version --short)
|
||||
COMPOSE_VER=$(docker_compose_command version --short)
|
||||
if [ "$(version "$COMPOSE_VER")" -lt "$(version "$MIN_COMPOSE_VER")" ]; then
|
||||
echo "ERR: Your Docker-compose version is known to have bugs, please update docker-compose!"
|
||||
exit 1
|
||||
@@ -116,7 +131,7 @@ echo " : Started : $STARTDATE "
|
||||
echo " : Your bash version: $BASH_VERSION"
|
||||
echo " : Your OS : $OSTYPE"
|
||||
docker --version
|
||||
docker-compose --version
|
||||
docker_compose_command --version
|
||||
|
||||
if [[ "$OSTYPE" == "linux-gnu" ]]; then
|
||||
echo " "
|
||||
|
||||
Reference in New Issue
Block a user