diff --git a/pkg/package.mk b/pkg/package.mk index 350846778..d55c8fee9 100644 --- a/pkg/package.mk +++ b/pkg/package.mk @@ -24,20 +24,24 @@ else NET_OPT=--network=none endif +ifeq ($(DOCKER_CONTENT_TRUST),) +ifndef NOTRUST +export DOCKER_CONTENT_TRUST=1 +endif +endif + show-tag: @echo $(TAG) tag: $(BASE_DEPS) $(DEPS) - DOCKER_CONTENT_TRUST=1 docker pull $(TAG) || \ - docker build $(NET_OPT) -t $(TAG) . + docker pull $(TAG) || docker build $(NET_OPT) -t $(TAG) . push: tag ifneq ($(DIRTY),) $(error Your repository is not clean. Will not push package image.) endif - DOCKER_CONTENT_TRUST=1 docker pull $(TAG) || \ - DOCKER_CONTENT_TRUST=1 docker push $(TAG) + docker pull $(TAG) || docker push $(TAG) ifneq ($(RELEASE),) docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE) - DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(RELEASE) + docker push $(ORG)/$(IMAGE):$(RELEASE) endif diff --git a/projects/swarmd/swarmd/Makefile b/projects/swarmd/swarmd/Makefile index 9550aeffe..f57b5fc59 100644 --- a/projects/swarmd/swarmd/Makefile +++ b/projects/swarmd/swarmd/Makefile @@ -1,5 +1,6 @@ ORG?=linuxkitprojects IMAGE=swarmd NETWORK=1 +NOTRUST=1 include ../../../pkg/package.mk