From c075f264767f02bb54f81ea5e9191d6584c43d9c Mon Sep 17 00:00:00 2001 From: Andreas Neue Date: Mon, 21 Nov 2022 17:09:39 +0100 Subject: [PATCH] reload target calls ./reload.sh on (for all deploy types) --- Makefile | 6 +++++- docker.mk | 12 ------------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index d481916..9e11c9a 100644 --- a/Makefile +++ b/Makefile @@ -69,4 +69,8 @@ logs: logs-$(DEPLOY_TYPE) restart: restart-$(DEPLOY_TYPE) -reload: reload-$(DEPLOY_TYPE) +reload: + @- $(foreach host,$(DEPLOY_HOSTS), \ + echo "$(host)"; \ + ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); ./reload.sh; \ + ) diff --git a/docker.mk b/docker.mk index 6640af2..1b418ae 100644 --- a/docker.mk +++ b/docker.mk @@ -55,15 +55,3 @@ restart-compose: restart-swarm: # nop - -reload-compose: - @- $(foreach host,$(DEPLOY_HOSTS), \ - echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); ./reload.sh; \ - ) - -reload-swarm: - @- $(foreach host,$(DEPLOY_HOSTS), \ - echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); ./reload.sh; \ - )