L2SS-988: Do not use individual targets for await target

docker-compose/Makefile

@@ -13,6 +13,9 @@ ATTACH_COMPOSE_FILE_ARGS := $(foreach yml,$(filter-out tango.yml,$(COMPOSE_FILES
 # But we allow to overwrite it.
 NETWORK_MODE ?= tangonet
 
+# Timeout used to await services to become healthy
+TIMEOUT ?= 300
+
 SCRATCH ?= /tmp
 
 # Host name through which others can reach our control interfaces.
@@ -52,7 +55,6 @@ else ifeq (attach,$(firstword $(MAKECMDGOALS)))
     endif
 else ifeq (await,$(firstword $(MAKECMDGOALS)))
     SERVICE_TARGET = true
-	WAIT = true
 else ifeq (run,$(firstword $(MAKECMDGOALS)))
     RUN_TARGET = true
 else ifeq (integration,$(firstword $(MAKECMDGOALS)))
@@ -62,11 +64,7 @@ endif
 ifdef SERVICE_TARGET
     # .. then use the rest as arguments for the make target
     SERVICE := $(wordlist 2,$(words $(MAKECMDGOALS)),$(MAKECMDGOALS))
-	ifdef WAIT
-		AWAITS := $(SERVICE)
-    endif
     # ...and turn them into do-nothing targets
-    $(eval $(AWAITS):;@:)
     $(eval $(SERVICE):;@:)
 else ifdef RUN_TARGET
     # Isolate second argument as service, the rest is arguments for run command
@@ -226,23 +224,19 @@ restart: ## restart a service (usage: make restart <servicename>)
 attach:  ## attach a service to an existing Tango network
 	$(DOCKER_COMPOSE_ARGS) docker-compose $(ATTACH_COMPOSE_FILE_ARGS) up --no-recreate -d $(SERVICE)
 
-await: $(AWAITS)
-
-# Await every container with total max timeout of 300, do not reset timeout
-# in between containers.
-# Awaiting for ready is done through inspecting health status
-timeout ?= 300
-time := 0
-$(AWAITS):
-	timeout=$(timeout); \
-	current_service=$$($(DOCKER_COMPOSE_ARGS) docker-compose $(COMPOSE_FILE_ARGS) ps -q $@); \
+await:  ## Await every container with total max timeout of 300, do not reset timeout
+	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 \
 			sleep 1; \
 			time=`expr $$time + 1`; \
-		if [ $${time} -gt $${timeout} ]; then \
-			echo "Timeout reached waiting for $@ to become healthy"; \
+			if [ $${time} -gt $${TIMEOUT} ]; then \
+				echo "Timeout reached waiting for $${i} to become healthy"; \
 				exit 1; \
 			fi; \
+		done; \
+		echo "Service $${i} is healthy"; \
 	done
 
 status:  ## show the container status