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

kernel: Move build label add to Makefile

Browse Source 
where the other labels are defined

Signed-off-by: Rolf Neugebauer <rn@rneugeba.io>
This commit is contained in:
Rolf Neugebauer 2021-05-27 08:25:45 +00:00
parent 70ac373206
commit 5f959a9bcd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/Dockerfile
View File

@ -195,7 +195,6 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept
( cd /tmp && tar cf /out/kernel-dev.tar usr/src ) ( cd /tmp && tar cf /out/kernel-dev.tar usr/src )
RUN printf "${BUILD_IMAGE}" > /out/kernel-builder RUN printf "${BUILD_IMAGE}" > /out/kernel-builder
LABEL org.mobyproject.linuxkit.kernel.buildimage ${BUILD_IMAGE}
FROM scratch FROM scratch
ENTRYPOINT [] ENTRYPOINT []

5
kernel/Makefile
View File

@ -55,6 +55,8 @@ endif
TAG=$(HASH)$(DIRTY) TAG=$(HASH)$(DIRTY)
BUILD_LABEL=--label org.mobyproject.linuxkit.kernel.buildimage=$(IMAGE_BUILDER)
REPO?=https://github.com/linuxkit/linuxkit REPO?=https://github.com/linuxkit/linuxkit
ifneq ($(REPO),) ifneq ($(REPO),)
REPO_LABEL=--label org.opencontainers.image.source=$(REPO) REPO_LABEL=--label org.opencontainers.image.source=$(REPO)
@ -63,7 +65,8 @@ ifeq ($(DIRTY),)
REPO_COMMIT=$(shell git rev-parse HEAD) REPO_COMMIT=$(shell git rev-parse HEAD)
COMMIT_LABEL=--label org.opencontainers.image.revision=$(REPO_COMMIT) COMMIT_LABEL=--label org.opencontainers.image.revision=$(REPO_COMMIT)
endif endif
LABELS=$(REPO_LABEL) $(COMMIT_LABEL)
LABELS=$(REPO_LABEL) $(COMMIT_LABEL) $(BUILD_LABEL)
KERNEL_VERSIONS= KERNEL_VERSIONS=