From 2aef5f29c304d157967f21eaefe78301692009c6 Mon Sep 17 00:00:00 2001 From: Martin Lablans Date: Fri, 28 Oct 2022 10:12:21 +0200 Subject: [PATCH] Move to functions.sh --- bridgehead | 2 ++ lib/functions.sh | 9 +++++++++ lib/prerequisites.sh | 6 ------ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bridgehead b/bridgehead index b204383..f18311a 100755 --- a/bridgehead +++ b/bridgehead @@ -58,6 +58,8 @@ if [ -f "$PROJECT/docker-compose.override.yml" ]; then OVERRIDE+=" -f ./$PROJECT/docker-compose.override.yml" fi +detectCompose + case "$ACTION" in start) hc_send log "Bridgehead $PROJECT startup: Checking requirements ..." diff --git a/lib/functions.sh b/lib/functions.sh index e3df4ad..b5a03a0 100755 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -2,6 +2,15 @@ source lib/log.sh +detectCompose() { + if [[ "$(docker compose version 2>/dev/null)" == *"Docker Compose version"* ]]; then + COMPOSE="docker compose" + else + COMPOSE="docker-compose" + # This is intended to fail on startup in the next prereq check. + fi +} + exitIfNotRoot() { if [ "$EUID" -ne 0 ]; then log "ERROR" "Please run as root" diff --git a/lib/prerequisites.sh b/lib/prerequisites.sh index dfd3cdd..d90d50e 100755 --- a/lib/prerequisites.sh +++ b/lib/prerequisites.sh @@ -10,12 +10,6 @@ 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 $COMPOSE"