[openwhisk-devtools] branch master updated: Do not use --abort-on-container-exit when starting docker-compose (#262)

[ra...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-devtools.git


The following commit(s) were added to refs/heads/master by this push:
     new 12e3f04  Do not use --abort-on-container-exit when starting docker-compose (#262)
12e3f04 is described below

commit 12e3f04eb82076311644b361c970761660e856c1
Author: Alvaro Lopez Garcia <al...@ifca.unican.es>
AuthorDate: Tue Jan 7 21:37:14 2020 +0000

    Do not use --abort-on-container-exit when starting docker-compose (#262)
    
    If we use the flag "--abort-on-container-exit" we cannot restart a
    single Docker container, as docker-compose aborts its execution,
    therefore we cannot use any restart-* commands.
---
 docker-compose/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose/Makefile b/docker-compose/Makefile
index a9b2176..8cf840c 100644
--- a/docker-compose/Makefile
+++ b/docker-compose/Makefile
@@ -273,7 +273,7 @@ restart-invoker:
 
 .PHONY: start-docker-compose
 start-docker-compose:
-	$(shell cat $(TMP_HOME)/tmp/openwhisk/local.env) docker-compose --project-name openwhisk -f $(DOCKER_COMPOSE_FILE) up --abort-on-container-exit 2>&1 > $(TMP_HOME)/tmp/openwhisk/docker-compose.log &
+	$(shell cat $(TMP_HOME)/tmp/openwhisk/local.env) docker-compose --project-name openwhisk -f $(DOCKER_COMPOSE_FILE) up 2>&1 > $(TMP_HOME)/tmp/openwhisk/docker-compose.log &
 
 .PHONY: wait-for-docker-compose-up
 wait-for-docker-compose-up: