github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2161 from ijc/trust-issues

Browse Source 
pkg: Update content trust handling.
This commit is contained in:
Riyaz Faizullabhoy 2017-07-06 09:50:55 -07:00 committed by GitHub
commit 286d6ef9c0
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/package.mk
View File

@ -7,16 +7,16 @@ HASH_COMMIT?=HEAD # Setting this is only really useful with the show-tag target
HASH?=$(shell git ls-tree --full-tree $(HASH_COMMIT) -- $(CURDIR) | awk '{print $$3}') HASH?=$(shell git ls-tree --full-tree $(HASH_COMMIT) -- $(CURDIR) | awk '{print $$3}')
ifneq ($(HASH_COMMIT),HEAD) # Others can't be dirty by definition ifneq ($(HASH_COMMIT),HEAD) # Others can't be dirty by definition
DIRTY=$(shell git update-index -q --refresh && git diff-index --quiet HEAD -- $(CURDIR) || echo "-dirty") DIRTY:=$(shell git update-index -q --refresh && git diff-index --quiet HEAD -- $(CURDIR) || echo "-dirty")
endif endif
endif endif
TAG=$(ORG)/$(IMAGE):$(HASH)$(DIRTY) TAG:=$(ORG)/$(IMAGE):$(HASH)$(DIRTY)
BASE_DEPS=Dockerfile Makefile BASE_DEPS=Dockerfile Makefile
# Get a release tag, if present # Get a release tag, if present
RELEASE=$(shell git tag -l --points-at HEAD) RELEASE:=$(shell git tag -l --points-at HEAD)
ifdef NETWORK ifdef NETWORK
NET_OPT= NET_OPT=
@ -24,20 +24,24 @@ else
NET_OPT=--network=none NET_OPT=--network=none
endif endif
ifeq ($(DOCKER_CONTENT_TRUST),)
ifndef NOTRUST
export DOCKER_CONTENT_TRUST=1
endif
endif
show-tag: show-tag:
@echo $(TAG) @echo $(TAG)
tag: $(BASE_DEPS) $(DEPS) tag: $(BASE_DEPS) $(DEPS)
DOCKER_CONTENT_TRUST=1 docker pull $(TAG) || \ docker pull $(TAG) || docker build $(NET_OPT) -t $(TAG) .
docker build $(NET_OPT) -t $(TAG) .
push: tag push: tag
ifneq ($(DIRTY),) ifneq ($(DIRTY),)
$(error Your repository is not clean. Will not push package image.) $(error Your repository is not clean. Will not push package image.)
endif endif
DOCKER_CONTENT_TRUST=1 docker pull $(TAG) || \ docker pull $(TAG) || docker push $(TAG)
DOCKER_CONTENT_TRUST=1 docker push $(TAG)
ifneq ($(RELEASE),) ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE) docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE)
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(RELEASE) docker push $(ORG)/$(IMAGE):$(RELEASE)
endif endif

1
projects/swarmd/swarmd/Makefile
View File

@ -1,5 +1,6 @@
ORG?=linuxkitprojects ORG?=linuxkitprojects
IMAGE=swarmd IMAGE=swarmd
NETWORK=1 NETWORK=1
NOTRUST=1
include ../../../pkg/package.mk include ../../../pkg/package.mk