Unification

Author: YuryHrytsuk

services/rabbit/Makefile

@@ -59,12 +59,12 @@ ${CLEAN_VOLUMES_TEMP_COMPOSE}: docker-compose.clean-volumes.yaml .env
 	@${REPO_BASE_DIR}/scripts/docker-stack-config.bash -e .env $< > $@
 
 TIMEOUT = 2m
-delete-volumes: ${CLEAN_VOLUMES_TEMP_COMPOSE} guard-optional-bool-FORCE_CONFIRM
-	@$(call confirm_action,Forever delete all rabbit data?,yes,$(FORCE_CONFIRM))
+delete-volumes: ${CLEAN_VOLUMES_TEMP_COMPOSE} guard-optional-TIMEOUT guard-optional-bool-FORCE_CONFIRM
+	@$(call confirm_action,Forever delete all rabbit data?,yes,${FORCE_CONFIRM})
 	## avoid accumulating tasks https://github.com/moby/moby/issues/45443
 	@docker stack rm --detach=false ${CLEAN_VOLUMES_STACK_NAME}
 	## use --detach=false to wait until all jobs complete successfully
-	@timeout ${TIMEOUT} \
+	@timeout ${TIMEOUT}	\
 	docker stack deploy --detach=false --with-registry-auth --prune --compose-file ${CLEAN_VOLUMES_TEMP_COMPOSE} ${CLEAN_VOLUMES_STACK_NAME}
 	@docker stack rm ${CLEAN_VOLUMES_STACK_NAME}
 
@@ -73,7 +73,7 @@ delete-volumes: ${CLEAN_VOLUMES_TEMP_COMPOSE} guard-optional-bool-FORCE_CONFIRM
 #
 
 down: guard-optional-bool-FORCE_CONFIRM
-	@$(call confirm_action,Are you sure you want to stop the RabbitMQ cluster?,yes,$(FORCE_CONFIRM))
+	@$(call confirm_action,Are you sure you want to stop the RabbitMQ cluster?,yes,${FORCE_CONFIRM})
 	@docker stack rm ${STACK_NAME}
 
 destroy-cluster-with-data: down delete-volumes