diff --git a/Makefile b/Makefile index dd990ce..0160f55 100644 --- a/Makefile +++ b/Makefile @@ -42,13 +42,17 @@ upload: rsync -rav --exclude '*~' --exclude '.git*' . $(SSH_USER)@$(host):$(DEPLOY_PATH)/$(DEPLOY_NAME); \ ) -pull: +pull: pull-$(DEPLOY_TYPE) + +pull-compose: @- echo "\n### pulling image(s)" @- $(foreach ctx,$(DEPLOY_HOSTS), \ docker context use $(ctx); \ docker pull $(DOCKER_IMAGE); \ ) - + +pull-swarm: + start: start-$(DEPLOY_TYPE) start-compose: @@ -59,7 +63,11 @@ start-compose: ) start-swarm: - + @- echo "\n### starting service(s)" + @- $(foreach ctx,$(DEPLOY_HOSTS), \ + docker stack deploy -c $(DEPLOY_PATH)/$(DEPLOY_NAME)/stack.yml $(DEPLOY_NAME); \ + ) + stop: stop-$(DEPLOY_TYPE) stop-compose: @@ -70,7 +78,11 @@ stop-compose: ) stop-swarm: - + @- echo "\n### stopping service(s)" + @- $(foreach ctx,$(DEPLOY_HOSTS), \ + docker stack rm $(DEPLOY_NAME); \ + ) + logs: logs-$(DEPLOY_TYPE) logs-compose: @@ -78,9 +90,10 @@ logs-compose: @- docker context use $(host) @- docker-compose logs -f $(service) - logs-swarm: - + @- echo "\n### logs" + @- docker service logs -f $(service) + restart: restart-$(DEPLOY_TYPE) restart-compose: