diff --git a/Makefile b/Makefile index 3576da8..8285571 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,14 @@ .PHONY: self-update create-contexts deploy upload pull start stop restart include make-deploy/docker.mk +include make-deploy/k8s.mk +include make-deploy/cron.mk + include config.mk self-update: @- git submodule update --remote -create-contexts: - @- $(foreach host,$(DEPLOY_HOSTS), \ - docker context create $(host) --description "$(host)" --docker "host=ssh://$(SSH_USER)@$(host)"; \ - ) - deploy: upload pre-deploy pull start post-deploy pre-deploy: pre-deploy-$(DEPLOY_TYPE) @@ -20,6 +18,7 @@ post-deploy: post-deploy-$(DEPLOY_TYPE) upload: @- echo "\n### uploading files" @- $(foreach host,$(DEPLOY_HOSTS), \ + ssh $(SSH_USER)@$(host) "mkdir -p $(DEPLOY_PATH)/$(DEPLOY_NAME)"; \ rsync -rav --exclude '*~' --exclude '.git*' . $(SSH_USER)@$(host):$(DEPLOY_PATH)/$(DEPLOY_NAME); \ ) diff --git a/docker.mk b/docker.mk index 952d586..e9e4a4d 100644 --- a/docker.mk +++ b/docker.mk @@ -1,3 +1,8 @@ +create-docker-contexts: + @- $(foreach host,$(DEPLOY_HOSTS), \ + docker context create $(host) --description "$(host)" --docker "host=ssh://$(SSH_USER)@$(host)"; \ + ) + pre-deploy-compose: pre-deploy-docker post-deploy-compose: post-deploy-docker