github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Add forcepush target

Browse Source 
This is like the `push` target but omits the pulls and depends on forcetag
instead. With the git commit now being embedded into the image this is now a
necessary part of rebasing a PR for which images have already been pushed.

Also adds PHONY targets for existing forcetag and push targets which were
missing.

NB $(error) appends a "." to omit the final one from the error message

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-07-26 10:42:39 +01:00
parent 29ead2bd9d
commit 6c689a84dd
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/package.mk
View File

@ -1,4 +1,4 @@
.PHONY: image tag show-tag
.PHONY: image tag forcetag show-tag check-dirty push forcepush
default: push
ORG?=linuxkit
@ -55,12 +55,21 @@ tag: $(BASE_DEPS) $(DEPS)
forcetag: $(BASE_DEPS) $(DEPS)
docker build $(LABELS) $(NET_OPT) -t $(TAG) $(SOURCE)
push: tag
check-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
push: check-dirty tag
docker pull $(TAG) || docker push $(TAG)
ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE)
docker push $(ORG)/$(IMAGE):$(RELEASE)
endif
forcepush: check-dirty forcetag
docker push $(TAG)
ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE)
docker push $(ORG)/$(IMAGE):$(RELEASE)
endif