Resole merge conflicts

This commit is contained in:
Fred de Gier 2022-10-03 14:27:32 +02:00
commit de71bb6ff5
6 changed files with 53 additions and 35 deletions

View file

@ -8,9 +8,8 @@ fi
source .env
# On newer versions, docker-compose is docker compose
DOCKER_COMPOSE=$(command -v docker-compose)
if [ -z "$DOCKER_COMPOSE" ]; then
DOCKER_COMPOSE="docker compose"
if command -v docker-compose > /dev/null; then
docker compose up
else
docker-compose up
fi
$DOCKER_COMPOSE up