From c6865624e5dafff0eaae8ab7ecdb0d24d3a64b03 Mon Sep 17 00:00:00 2001 From: Patrick Skowronek Date: Mon, 16 May 2022 09:21:42 +0200 Subject: [PATCH] Removed ref to site.conf --- bridgehead | 6 ++---- lib/functions.sh | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bridgehead b/bridgehead index 9a5b1fa..7998d86 100755 --- a/bridgehead +++ b/bridgehead @@ -41,16 +41,14 @@ case "$PROJECT" in ;; esac -source /etc/bridgehead/site.conf - case "$ACTION" in start) checkRequirements fetchVarsFromVault /etc/bridgehead/site.conf /etc/bridgehead/$PROJECT.env || exit 1 - exec docker-compose -f ./$PROJECT/docker-compose.yml --env-file /etc/bridgehead/$PROJECT.env up + exec docker-compose -f ./$PROJECT/docker-compose.yml --env-file /etc/bridgehead/$PROJECT.conf up ;; stop) - exec docker-compose -f ./$PROJECT/docker-compose.yml --env-file /etc/bridgehead/$PROJECT.env down + exec docker-compose -f ./$PROJECT/docker-compose.yml --env-file /etc/bridgehead/$PROJECT.conf down ;; update) exec ./lib/update-bridgehead.sh $PROJECT diff --git a/lib/functions.sh b/lib/functions.sh index b313b0e..11b00e5 100755 --- a/lib/functions.sh +++ b/lib/functions.sh @@ -63,3 +63,7 @@ fetchVarsFromVault() { return 0 } + +##Setting Network properties +export HOSTIP=$(MSYS_NO_PATHCONV=1 docker run --rm --add-host=host.docker.internal:host-gateway ubuntu cat /etc/hosts | grep 'host.docker.internal' | awk '{print $1}'); +export HOST=$(hostname) \ No newline at end of file