mirror
/
make-deploy
mirror of https://git.chefkoch.net/pub/make-deploy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

introduced DEPLOY_PROJECT_DIR to specify project workdir under project path

This commit is contained in:
Andreas Neue 2025-04-14 10:13:08 +02:00
parent ea3f38010c
commit 27f15d441a
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -1,4 +1,5 @@
DEPLOY_START_DELAY = 0 DEPLOY_START_DELAY = 0
DEPLOY_PROJECT_DIR =
MANDATORY = DEPLOY_NAME DEPLOY_HOSTS DEPLOY_PATH SSH_USER MANDATORY = DEPLOY_NAME DEPLOY_HOSTS DEPLOY_PATH SSH_USER
@ -11,6 +12,8 @@ ifeq ($(DEPLOY_TYPE), copy)
DEPLOY_TYPE = simple DEPLOY_TYPE = simple
endif endif
project_dir = $(DEPLOY_PATH)/$(DEPLOY_NAME)$(DEPLOY_PROJECT_DIR)
include make-deploy/$(DEPLOY_TYPE).mk include make-deploy/$(DEPLOY_TYPE).mk
.PHONY: self-update mandatory cleanup prerequisites prepare build test deploy pre-deploy post-deploy pre-local post-local upload pull start stop restart reload notify .PHONY: self-update mandatory cleanup prerequisites prepare build test deploy pre-deploy post-deploy pre-local post-local upload pull start stop restart reload notify

17
compose.mk
View File

@ -23,14 +23,10 @@ pull-compose:
start-compose: start-compose:
@echo "\n### starting service(s)" @echo "\n### starting service(s)"
final_path = "$(DEPLOY_PATH)/$(DEPLOY_NAME)$(DEPLOY_PROJECT_DIR)"
$(foreach host,$(DEPLOY_HOSTS), \ $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \ echo "$(host)"; \
if test -n "$(DEPLOY_SUBPATH)" ; \ ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose up -d"; \
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); \ sleep $(DEPLOY_START_DELAY); \
) )
@ -38,18 +34,13 @@ 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 $(DEPLOY_PATH)/$(DEPLOY_NAME); 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)"; \
if test -n "$(DEPLOY_SUBPATH)" ; \ ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose restart"; \
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); \ sleep $(DEPLOY_START_DELAY); \
) )