From 0071d31d26a8bdb3e8fb0b092d31d087cc4fbed4 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.schneider@chefkoch.de>
Date: Thu, 10 Apr 2025 15:27:07 +0200
Subject: [PATCH] add possiblity to add subpath in compose (when docker-compose
 file is not in repo root)

---
 compose.mk | 49 ++++++++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 21 deletions(-)

diff --git a/compose.mk b/compose.mk
index fc22dd8..197964d 100644
--- a/compose.mk
+++ b/compose.mk
@@ -7,12 +7,12 @@ DOCKER_LOGIN = 0
 endif
 
 pull-compose:
-	@- echo "\n### pulling image(s)"
-	@- $(foreach host,$(DEPLOY_HOSTS), \
+	@echo "\n### pulling image(s)"
+	$(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		if test $(DOCKER_LOGIN) -eq 1 ; \
+		if test "$(DOCKER_LOGIN)" = "1" ; \
 		then \
-			echo "\n#### perfom docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \
+			echo "\n#### perform docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \
 			ssh $(SSH_USER)@$(host) "docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY)"; \
 		fi; \
 		if test -n "$(DOCKER_IMAGE)" ; \
@@ -22,27 +22,34 @@ pull-compose:
 	)
 
 start-compose:
-	@- echo "\n### starting service(s)"
-	@- $(foreach host,$(DEPLOY_HOSTS), \
+	@echo "\n### starting service(s)"
+	$(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose up -d"; \
+		if test -n "$(DEPLOY_SUBPATH)" ; \
+		then \
+			ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)/$(DEPLOY_SUBPATH); docker-compose up -d"; \
+		else \
+			ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose up -d"; \
+		fi; \
 		sleep $(DEPLOY_START_DELAY); \
 	)
 
-stop-compose:
-	@- echo "\n### stopping service(s)"
-	@- $(foreach host,$(DEPLOY_HOSTS), \
-		echo "$(host)"; \
-		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)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose logs -f $(service)"
-	
-restart-compose:
-	@- $(foreach host,$(DEPLOY_HOSTS), \
+	@echo "\n### logs"
+	$(foreach host,$(DEPLOY_HOSTS), \
 		echo "$(host)"; \
-		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)$(if$(DEPLOY_SUBPATH),/$(DEPLOY_SUBPATH),); docker-compose restart"; \
-		sleep $(DEPLOY_START_DELAY); \
+		ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose logs -f $(service)"; \
 	)
+
+restart-compose:
+	@echo "\n### restarting service(s)"
+	$(foreach host,$(DEPLOY_HOSTS), \
+		echo "$(host)"; \
+		if test -n "$(DEPLOY_SUBPATH)" ; \
+		then \
+			ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME)/$(DEPLOY_SUBPATH); docker-compose restart"; \
+		else \
+			ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose restart"; \
+		fi; \
+		sleep $(DEPLOY_START_DELAY); \
+	)
\ No newline at end of file