From d1d2478c2def0055a4c9176bdfa33ec89140819e Mon Sep 17 00:00:00 2001 From: Hari Sekhon Date: Sun, 26 Aug 2018 21:53:51 +0100 Subject: [PATCH 1/2] updated utils.sh --- utils.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils.sh b/utils.sh index e5a498b2..d9eb7b96 100755 --- a/utils.sh +++ b/utils.sh @@ -56,6 +56,7 @@ hr3(){ } section(){ + name="$@" hr "`dirname ${BASH_SOURCE[0]}`/center.sh" "$@" hr From fea0aa8e8f2703bea4fbac88898021119ab37828 Mon Sep 17 00:00:00 2001 From: Hari Sekhon Date: Thu, 27 Sep 2018 23:57:26 +0100 Subject: [PATCH 2/2] updated docker.sh --- docker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker.sh b/docker.sh index 31d22fc2..a9884ec3 100755 --- a/docker.sh +++ b/docker.sh @@ -59,8 +59,9 @@ check_docker_available(){ export DOCKER_SERVICE="${BASH_SOURCE[1]#*test_}" export DOCKER_SERVICE="${DOCKER_SERVICE%.sh}" export DOCKER_CONTAINER="${COMPOSE_PROJECT_NAME:-docker}" + # for Docker Machine but not Docker for Mac # nagios-plugins -> nagiosplugins - export DOCKER_CONTAINER="${DOCKER_CONTAINER//-}" + #export DOCKER_CONTAINER="${DOCKER_CONTAINER//-}" export DOCKER_CONTAINER="${DOCKER_CONTAINER}_${DOCKER_SERVICE}_1" export COMPOSE_FILE="$srcdir/docker/$DOCKER_SERVICE-docker-compose.yml" }