diff --git a/bridgehead b/bridgehead index fc454fd..68e8933 100755 --- a/bridgehead +++ b/bridgehead @@ -65,9 +65,7 @@ case "$ACTION" in hc_send log "Bridgehead $PROJECT startup: Checking requirements ..." checkRequirements hc_send log "Bridgehead $PROJECT startup: Requirements checked out. Now starting bridgehead ..." - set -a - setLdmPassword - set +a + export LDM_LOGIN=$(getLdmPassword) exec $COMPOSE -f ./$PROJECT/docker-compose.yml $OVERRIDE up --abort-on-container-exit ;; stop) diff --git a/lib/functions.sh b/lib/functions.sh index 0a0ab0a..6c81d7b 100755 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -11,10 +11,11 @@ detectCompose() { fi } -setLdmPassword() { +getLdmPassword() { if [ -n "$LDM_PASSWORD" ]; then - log DEBUG "Transforming LDM_PASSWORD into LDM_LOGIN ..." - export LDM_LOGIN=$(docker run --rm -it httpd:alpine htpasswd -nb $PROJECT $LDM_PASSWORD | tr -d '\n' | tr -d '\r') + docker run --rm httpd:alpine htpasswd -nb $PROJECT $LDM_PASSWORD | tr -d '\n' | tr -d '\r' + else + echo -n "" fi }