From 5755baaf009e8c332750baf44048285ae93d74c6 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Fri, 28 Oct 2022 10:06:43 +0200 Subject: [PATCH] Support docker compose as well as docker-compose --- bridgehead | 4 ++-- lib/prerequisites.sh | 8 +++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/bridgehead b/bridgehead index e1e1d0b..b204383 100755 --- a/bridgehead +++ b/bridgehead @@ -63,10 +63,10 @@ case "$ACTION" in hc_send log "Bridgehead $PROJECT startup: Checking requirements ..." checkRequirements hc_send log "Bridgehead $PROJECT startup: Requirements checked out. Now starting bridgehead ..." - exec docker-compose -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit + exec $COMPOSE -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit ;; stop) - exec docker-compose -f ./$PROJECT/docker-compose.yml $OVERRIDE down + exec $COMPOSE -f ./$PROJECT/docker-compose.yml $OVERRIDE down ;; update) exec ./lib/update-bridgehead.sh $PROJECT diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index 2738620..dfd3cdd 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -10,9 +10,15 @@ fi checkOwner . bridgehead || exit 1 checkOwner /etc/bridgehead bridgehead || exit 1 +if [[ "$(docker compose version 2>/dev/null)" == *"Docker Compose version"* ]]; then + COMPOSE="docker compose" +else + COMPOSE="docker-compose" +fi + ## Check if user is a su log INFO "Checking if all prerequisites are met ..." -prerequisites="git docker docker-compose" +prerequisites="git docker $COMPOSE" for prerequisite in $prerequisites; do $prerequisite --version 2>&1 is_available=$?