diff --git a/docker-compose/Makefile b/docker-compose/Makefile index e7c3c0576a0a4dbf21157b7720a34b057eaab8c9..1025691644ab0ee77729e6dd0cf7a19464bc2599 100644 --- a/docker-compose/Makefile +++ b/docker-compose/Makefile @@ -228,10 +228,13 @@ await: ## Await every container with total max timeout of 300, do not reset tim time=0 for i in $(SERVICE); do \ current_service=$$($(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) ps -q $${i}); \ - while [ "`docker inspect -f {{.State.Health.Status}} $${current_service}`" != "healthy" ] ; do \ + if [ -z "$${current_service}" ]; then \ + continue; \ + fi; \ + while [ "$$(docker inspect -f '{{.State.Health.Status}}' $${current_service})" != "healthy" ] ; do \ sleep 1; \ - time=`expr $$time + 1`; \ - if [ $${time} -gt $${TIMEOUT} ]; then \ + time=$$(expr $${time} + 1); \ + if [ $${time} -gt $(TIMEOUT) ]; then \ echo "Timeout reached waiting for $${i} to become healthy"; \ exit 1; \ fi; \