github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-09-25 16:46:23 +00:00
Code Issues Projects Releases Wiki Activity

Add labels for repo and commit to packages

Browse Source 
- use image spec metadata https://github.com/opencontainers/image-spec/blob/master/annotations.md
- omit commit if dirty

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-07-11 13:55:24 +01:00
parent 9ee7b23d1e
commit ed38adbc90
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/package.mk
View File

@@ -13,6 +13,16 @@ endif
TAG:=$(ORG)/$(IMAGE):$(HASH)$(DIRTY)
REPO?=https://github.com/linuxkit/linuxkit
ifneq ($(REPO),)
REPO_LABEL=--label org.opencontainers.image.source=$(REPO)
endif
ifeq ($(DIRTY),)
REPO_COMMIT=$(shell git rev-parse HEAD)
COMMIT_LABEL=--label org.opencontainers.image.revision=$(REPO_COMMIT)
endif
LABELS=$(REPO_LABEL) $(COMMIT_LABEL)
BASE_DEPS=Dockerfile Makefile
# Get a release tag, if present
@@ -34,7 +44,7 @@ show-tag:
@echo $(TAG)
tag: $(BASE_DEPS) $(DEPS)
docker pull $(TAG) || docker build $(NET_OPT) -t $(TAG) .
docker pull $(TAG) || docker build $(LABELS) $(NET_OPT) -t $(TAG) .
push: tag
ifneq ($(DIRTY),)