From af40f19015a4ff95e6027f83c3ae4a25468f5569 Mon Sep 17 00:00:00 2001 From: an Date: Fri, 18 Jul 2025 09:27:06 +0000 Subject: [PATCH 1/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ca140d4..c9b816d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A simple Makefile based deployment system. 1. Clone **make-deploy** as a submodule into your repository: - $ git submodule add https://git.chefkoch.net/pub/make-deploy + $ git submodule add https://git.dnix.de/dnix/make-deploy 2. Create a symlink to the Makefile: From 6174ab4e7abc56890a84327c39f14b08874d03df Mon Sep 17 00:00:00 2001 From: an Date: Mon, 21 Jul 2025 06:53:57 +0000 Subject: [PATCH 2/3] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 8c4c087..c9b816d 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ A simple Makefile based deployment system. -**make-deploy** was initially hosted at https://git.dnix.de/an/make-deploy. Since it has become heavily used at chefkoch.de for system deployments, and lots of code is committed there, we moved the repo to https://git.chefkoch.net/pub/make-deploy. A mirror still exists at https://git.dnix.de/mirror/make-deploy. - **make-deploy** is licensed under the terms of the MIT-License. See [LICENSE](LICENSE) for info. ## Installation From 10f57bb27cd99cc3d5526489dee11fa675149370 Mon Sep 17 00:00:00 2001 From: Andreas Neue Date: Wed, 17 Sep 2025 10:17:06 +0200 Subject: [PATCH 3/3] compose command --- compose.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/compose.mk b/compose.mk index 0142d3f..016eb49 100644 --- a/compose.mk +++ b/compose.mk @@ -6,6 +6,10 @@ ifndef DOCKER_LOGIN DOCKER_LOGIN = 0 endif +ifndef COMPOSE_CMD +COMPOSE_CMD = 'docker-compose' +endif + pull-compose: @echo "\n### pulling image(s)" @$(foreach host,$(DEPLOY_HOSTS), \ @@ -26,7 +30,7 @@ start-compose: @$(foreach host,$(DEPLOY_HOSTS), \ set -e; \ echo "#host: $(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose up -d"; \ + ssh $(SSH_USER)@$(host) "cd $(project_dir); $(COMPOSE_CMD) up -d"; \ sleep $(DEPLOY_START_DELAY); \ set +e; \ ) @@ -36,7 +40,7 @@ logs-compose: @$(foreach host,$(DEPLOY_HOSTS), \ set -e; \ echo "#host: $(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose logs -f $(service)"; \ + ssh $(SSH_USER)@$(host) "cd $(project_dir); $(COMPOSE_CMD) logs -f $(service)"; \ set +e; \ ) @@ -45,7 +49,7 @@ restart-compose: @$(foreach host,$(DEPLOY_HOSTS), \ set -e; \ echo "#host: $(host)"; \ - ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose restart"; \ + ssh $(SSH_USER)@$(host) "cd $(project_dir); $(COMPOSE_CMD) restart"; \ sleep $(DEPLOY_START_DELAY); \ set +e; \ )