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

Merge pull request #2313 from arm64b/dirty-make-issue

Browse Source 
package.mk: Adjust the targe sequence to avoid early abort
This commit is contained in:
Justin Cormack 2017-07-28 14:31:49 +01:00 committed by GitHub
commit 25ddb186a4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/package.mk
View File

@ -60,14 +60,14 @@ 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
push: check-dirty tag push: tag check-dirty
docker pull $(TAG) || docker push $(TAG) docker pull $(TAG) || docker push $(TAG)
ifneq ($(RELEASE),) ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE) docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE)
docker push $(ORG)/$(IMAGE):$(RELEASE) docker push $(ORG)/$(IMAGE):$(RELEASE)
endif endif
forcepush: check-dirty forcetag forcepush: forcetag check-dirty
docker push $(TAG) docker push $(TAG)
ifneq ($(RELEASE),) ifneq ($(RELEASE),)
docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE) docker tag $(TAG) $(ORG)/$(IMAGE):$(RELEASE)