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

fix builder image tagging using new remote-tag option of linuxkit

Browse Source 
Signed-off-by: Avi Deitcher <avi@deitcher.net>
This commit is contained in:
Avi Deitcher 2024-03-06 10:19:01 +02:00
parent 17ed8938e0
commit 3087e9055a
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kernel/Makefile
View File

@ -36,19 +36,14 @@ endif
REPO_ROOT:=$(shell git rev-parse --show-toplevel) REPO_ROOT:=$(shell git rev-parse --show-toplevel)
# Path to push-manifest.sh
PUSH_MANIFEST:=$(REPO_ROOT)/scripts/push-manifest.sh
# determine our architecture # determine our architecture
BUILDERARCH= BUILDERARCH=
ifneq ($(ARCH),) ifneq ($(ARCH),)
ifeq ($(ARCH),$(filter $(ARCH),x86_64 amd64)) ifeq ($(ARCH),$(filter $(ARCH),x86_64 amd64))
SUFFIX=-amd64
override ARCH=x86_64 override ARCH=x86_64
BUILDERARCH=amd64 BUILDERARCH=amd64
endif endif
ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64)) ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64))
SUFFIX=-arm64
override ARCH=aarch64 override ARCH=aarch64
BUILDERARCH=arm64 BUILDERARCH=arm64
endif endif
@ -143,9 +138,7 @@ push-%: notdirty build-% pushkernel-% tagbuilder-% pushtools-%;
# we cannot assume that IMAGE_BUILDER is available locally, whether in docker image cache or limuxkit cache # we cannot assume that IMAGE_BUILDER is available locally, whether in docker image cache or limuxkit cache
tagbuilder-%: notdirty tagbuilder-%: notdirty
$(eval BUILDER_IMAGE=$(call baseimage,$*)-builder) $(eval BUILDER_IMAGE=$(call baseimage,$*)-builder)
docker tag $(IMAGE_BUILDER) $(BUILDER_IMAGE)$(SUFFIX) && \ linuxkit pkg remote-tag $(IMAGE_BUILDER) $(BUILDER_IMAGE)
docker push $(BUILDER_IMAGE)$(SUFFIX) && \
$(PUSH_MANIFEST) $(BUILDER_IMAGE)
pushkernel-%: pushplainkernel-% pushdebugkernel-%; pushkernel-%: pushplainkernel-% pushdebugkernel-%;

2
test/cases/020_kernel/019_config_6.6.x/test.yml
View File

@ -1,5 +1,5 @@
kernel: kernel:
image: linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5 image: linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a
cmdline: "console=ttyS0 console=ttyAMA0" cmdline: "console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04 - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04

2
test/cases/020_kernel/119_kmod_6.6.x/Dockerfile
View File

@ -3,7 +3,7 @@
# In the last stage, it creates a package, which can be used for # In the last stage, it creates a package, which can be used for
# testing. # testing.
FROM linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5 AS ksrc FROM linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a AS ksrc
# Extract headers and compile module # Extract headers and compile module
FROM linuxkit/kernel:6.6.13-builder AS build FROM linuxkit/kernel:6.6.13-builder AS build

2
test/cases/020_kernel/119_kmod_6.6.x/test.yml
View File

@ -1,5 +1,5 @@
kernel: kernel:
image: linuxkit/kernel:6.6.13-ad4d0da9e582d714cf61c8d99468cc7c1109bce5 image: linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a
cmdline: "console=ttyS0 console=ttyAMA0" cmdline: "console=ttyS0 console=ttyAMA0"
init: init:
- linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04 - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04