compose.mk: suppress echoing of bash source

This commit is contained in:
Andreas Neue 2025-05-20 14:02:32 +02:00
parent 11833028a2
commit e188f6b7b9

View file

@ -7,9 +7,9 @@ DOCKER_LOGIN = 0
endif endif
pull-compose: pull-compose:
@echo "\n### pulling image(s)" @- echo "\n### pulling image(s)"
$(foreach host,$(DEPLOY_HOSTS), \ @- $(foreach host,$(DEPLOY_HOSTS), \
@echo "$(host)"; \ echo "$(host)"; \
if test "$(DOCKER_LOGIN)" = "1" ; \ if test "$(DOCKER_LOGIN)" = "1" ; \
then \ then \
echo "\n#### perform docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \ echo "\n#### perform docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \
@ -22,24 +22,24 @@ pull-compose:
) )
start-compose: start-compose:
@echo "\n### starting service(s)" @- echo "\n### starting service(s)"
$(foreach host,$(DEPLOY_HOSTS), \ @- $(foreach host,$(DEPLOY_HOSTS), \
@echo "$(host)"; \ echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose up -d"; \ ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose up -d"; \
sleep $(DEPLOY_START_DELAY); \ sleep $(DEPLOY_START_DELAY); \
) )
logs-compose: logs-compose:
@echo "\n### logs" @- echo "\n### logs"
$(foreach host,$(DEPLOY_HOSTS), \ @- $(foreach host,$(DEPLOY_HOSTS), \
@echo "$(host)"; \ echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose logs -f $(service)"; \ ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose logs -f $(service)"; \
) )
restart-compose: restart-compose:
@echo "\n### restarting service(s)" @- echo "\n### restarting service(s)"
$(foreach host,$(DEPLOY_HOSTS), \ @- $(foreach host,$(DEPLOY_HOSTS), \
@echo "$(host)"; \ echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose restart"; \ ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose restart"; \
sleep $(DEPLOY_START_DELAY); \ sleep $(DEPLOY_START_DELAY); \
) )