From b299948bf87c76e0512abb65b10340ce18e92863 Mon Sep 17 00:00:00 2001 From: Thomas Schneider Date: Wed, 9 Apr 2025 16:11:18 +0200 Subject: [PATCH] add possibility to add a subpath if docker-compose stuff is not in repo root --- compose.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/compose.mk b/compose.mk index 36e23a9..fc22dd8 100644 --- a/compose.mk +++ b/compose.mk @@ -25,7 +25,7 @@ start-compose: @- echo "\n### starting service(s)" @- $(foreach host,$(DEPLOY_HOSTS), \ echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose up -d"; \ + ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose up -d"; \ sleep $(DEPLOY_START_DELAY); \ ) @@ -33,16 +33,16 @@ stop-compose: @- echo "\n### stopping service(s)" @- $(foreach host,$(DEPLOY_HOSTS), \ echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose down"; \ + ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose down"; \ ) logs-compose: @- echo "\n### logs" - @- ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose logs -f $(service)" + @- ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose logs -f $(service)" restart-compose: @- $(foreach host,$(DEPLOY_HOSTS), \ echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose restart"; \ + ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose restart"; \ sleep $(DEPLOY_START_DELAY); \ )