+fix makefile.ci now works with prod-releaser

This commit is contained in:
xdrm-brackets 2018-02-19 15:37:45 +01:00
parent 209b656bb3
commit dd0f3253ee
1 changed files with 7 additions and 4 deletions

11
Makefile Normal file → Executable file
View File

@ -15,7 +15,7 @@ start-no-cache:
@bash ./metactl/pre-start.sh && echo "< done" || (echo "< failed"; exit 1); @bash ./metactl/pre-start.sh && echo "< done" || (echo "< failed"; exit 1);
@echo; @echo;
@echo "> [2] Build & launch environment"; @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;
@echo "> [3] post-start script"; @echo "> [3] post-start script";
@bash ./metactl/post-start.sh && echo "< done" || (echo "< failed"; exit 1); @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); @bash ./metactl/pre-stop.sh && echo "< done" || (echo "< failed"; exit 1);
@echo; @echo;
@echo "> [2] Stop and remove environment"; @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;
@echo "> [3] post-stop script"; @echo "> [3] post-stop script";
@bash ./metactl/post-stop.sh && echo "< done" || (echo "< failed"; exit 1); @bash ./metactl/post-stop.sh && echo "< done" || (echo "< failed"; exit 1);
@ -40,13 +40,16 @@ ci:
@echo "*************************"; @echo "*************************";
@echo; @echo;
@echo -n "*** Create trigger............."; @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;
@echo "*** Launch environment.........launching"; @echo "*** Launch environment.........launching";
@make start-no-cache | sed 's/^\(.\)/\t\1/g' || (exit 1); @make start-no-cache | sed 's/^\(.\)/\t\1/g' || (exit 1);
@echo; @echo;
@echo "*** Wait for trigger...........waiting"; @echo "*** Wait for trigger...........waiting";
@while [ -f ./virtual/trigger ]; do sleep 1; done; @while [ -f ./virtual/ci/trigger ]; do sleep 1; done;
@echo; @echo;
@echo "*** Remove environment.........removing"; @echo "*** Remove environment.........removing";
@make stop; @make stop;