github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 01:29:07 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Add invocation to push-manifest to generic package build

Browse Source 
Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-08-02 14:33:50 +01:00
parent 6d4162343a
commit c8e0d2ca28
1 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pkg/package.mk
View File

@ -17,6 +17,14 @@ DIRTY:=$(shell git update-index -q --refresh && git diff-index --quiet HEAD -- $
endif endif
endif endif
ARCH := $(shell uname -m)
ifeq ($(ARCH), x86_64)
SUFFIX=-amd64
endif
ifeq ($(ARCH), aarch64)
SUFFIX=-arm64
endif
TAG:=$(ORG)/$(IMAGE):$(HASH)$(DIRTY) TAG:=$(ORG)/$(IMAGE):$(HASH)$(DIRTY)
REPO?=https://github.com/linuxkit/linuxkit REPO?=https://github.com/linuxkit/linuxkit
@ -34,6 +42,9 @@ 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)
# Path to push-manifest.sh
PUSH_MANIFEST:=$(shell git rev-parse --show-toplevel)/scripts/push-manifest.sh
ifdef NETWORK ifdef NETWORK
NET_OPT= NET_OPT=
else else
@ -50,10 +61,11 @@ show-tag:
@echo $(TAG) @echo $(TAG)
tag: $(BASE_DEPS) $(DEPS) tag: $(BASE_DEPS) $(DEPS)
docker pull $(TAG) || docker build $(LABELS) $(NET_OPT) -t $(TAG) $(SOURCE) docker pull $(TAG)$(SUFFIX) || \
docker build $(LABELS) $(NET_OPT) -t $(TAG)$(SUFFIX) $(SOURCE)
forcetag: $(BASE_DEPS) $(DEPS) forcetag: $(BASE_DEPS) $(DEPS)
docker build $(LABELS) $(NET_OPT) -t $(TAG) $(SOURCE) docker build $(LABELS) $(NET_OPT) -t $(TAG)$(SUFFIX) $(SOURCE)
check-dirty: check-dirty:
ifneq ($(DIRTY),) ifneq ($(DIRTY),)
@ -61,15 +73,20 @@ ifneq ($(DIRTY),)
endif endif
push: tag check-dirty push: tag check-dirty
docker pull $(TAG) || docker push $(TAG) docker pull $(TAG)$(SUFFIX) || \
(docker push $(TAG)$(SUFFIX) && \
$(PUSH_MANIFEST) $(TAG) $(DOCKER_CONTENT_TRUST))
ifneq ($(RELEASE),) ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE) docker tag $(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX)
docker push $(ORG)/$(IMAGE):$(RELEASE) docker push $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX)
$(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(RELEASE) $(DOCKER_CONTENT_TRUST)
endif endif
forcepush: forcetag check-dirty forcepush: forcetag check-dirty
docker push $(TAG) docker push $(TAG)$(SUFFIX)
$(PUSH_MANIFEST) $(TAG) $(DOCKER_CONTENT_TRUST)
ifneq ($(RELEASE),) ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE) docker tag $(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(RELEASE)
docker push $(ORG)/$(IMAGE):$(RELEASE) docker push $(ORG)/$(IMAGE):$(RELEASE)$(SUFFIX)
$(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(RELEASE) $(DOCKER_CONTENT_TRUST)
endif endif