From dd0f3253eeab83b4315b604bbd07c143f6243f77 Mon Sep 17 00:00:00 2001 From: xdrm-brackets Date: Mon, 19 Feb 2018 15:37:45 +0100 Subject: [PATCH] +fix makefile.ci now works with prod-releaser --- Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 Makefile diff --git a/Makefile b/Makefile old mode 100644 new mode 100755 index 8fecc1e..ab92890 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ start-no-cache: @bash ./metactl/pre-start.sh && echo "< done" || (echo "< failed"; exit 1); @echo; @echo "> [2] Build & launch environment"; - @docker-compose up --force-recreate -d > /dev/null 2>&1 && echo "< done" || (echo "< failed"; exit 1); + @docker-compose up -d --build > /dev/null 2>&1 && echo "< done" || (echo "< failed"; exit 1); @echo; @echo "> [3] post-start script"; @bash ./metactl/post-start.sh && echo "< done" || (echo "< failed"; exit 1); @@ -26,7 +26,7 @@ stop: @bash ./metactl/pre-stop.sh && echo "< done" || (echo "< failed"; exit 1); @echo; @echo "> [2] Stop and remove environment"; - @docker-compose down > /dev/null 2>&1 && echo "< done" || (echo "< failed"; exit 1); + @docker-compose down --remove-orphans > /dev/null 2>&1 && echo "< done" || (echo "< failed"; exit 1); @echo; @echo "> [3] post-stop script"; @bash ./metactl/post-stop.sh && echo "< done" || (echo "< failed"; exit 1); @@ -40,13 +40,16 @@ ci: @echo "*************************"; @echo; @echo -n "*** Create trigger............."; - @touch ./virtual/trigger && echo "done" || (echo "error"; exit 1); + @test ! -d ./virtual/ci && mkdir ./virtual/ci; + @chmod 777 ./virtual/ci; + @touch ./virtual/ci/trigger && echo "done" || (echo "error"; exit 1); + @chmod 777 ./virtual/ci/trigger; @echo; @echo "*** Launch environment.........launching"; @make start-no-cache | sed 's/^\(.\)/\t\1/g' || (exit 1); @echo; @echo "*** Wait for trigger...........waiting"; - @while [ -f ./virtual/trigger ]; do sleep 1; done; + @while [ -f ./virtual/ci/trigger ]; do sleep 1; done; @echo; @echo "*** Remove environment.........removing"; @make stop;