diff --git a/docker.mk b/docker.mk index 4cfddb6..149d6f3 100644 --- a/docker.mk +++ b/docker.mk @@ -7,7 +7,7 @@ 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 @@ -32,6 +32,7 @@ pull-compose: @- echo "\n### pulling image(s)" @- $(foreach ctx,$(DEPLOY_HOSTS), \ docker context use $(ctx); \ + if [ $(DOCKER_LOGIN) == 'true' ] then docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY) fi; \ docker pull $(DOCKER_IMAGE); \ )