diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 9d500a405..ac1f34499 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -1,6 +1,8 @@ ARG BUILD_IMAGE +ARG KERNEL_VERSION +ARG PKG_HASH -FROM ${KERNEL_VERSION}-${HASH} as ksrc +FROM linuxkit/kernel:${KERNEL_VERSION}-${PKG_HASH} as ksrc FROM ${BUILD_IMAGE} AS build RUN apk update && apk upgrade -a && \ diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index becca6a7a..147c7fcc6 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -1,8 +1,10 @@ # This Dockerfile extracts the source code and headers from a kernel package, # builds the perf utility, and places it into a scratch image ARG BUILD_IMAGE +ARG KERNEL_VERSION +ARG PKG_HASH -FROM ${KERNEL_VERSION}-${HASH} AS ksrc +FROM linuxkit/kernel:${KERNEL_VERSION}-${PKG_HASH} as ksrc FROM ${BUILD_IMAGE} AS build RUN apk add \ diff --git a/kernel/build-bcc.yml b/kernel/build-bcc.yml index de0cc8c2c..ec13b0eed 100644 --- a/kernel/build-bcc.yml +++ b/kernel/build-bcc.yml @@ -1,2 +1,3 @@ image: kernel-bcc network: true +dockerfile: Dockerfile.bcc diff --git a/kernel/build-perf.yml b/kernel/build-perf.yml index 5fb9a8b0c..33a66e674 100644 --- a/kernel/build-perf.yml +++ b/kernel/build-perf.yml @@ -1,2 +1,3 @@ image: kernel-perf network: true +dockerfile: Dockerfile.perf diff --git a/test/cases/020_kernel/019_config_6.6.x/test.yml b/test/cases/020_kernel/019_config_6.6.x/test.yml index 8ab559173..fa5e38292 100644 --- a/test/cases/020_kernel/019_config_6.6.x/test.yml +++ b/test/cases/020_kernel/019_config_6.6.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a + image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04 diff --git a/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile b/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile index cc48b0679..3d148ef87 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile +++ b/test/cases/020_kernel/119_kmod_6.6.x/Dockerfile @@ -3,7 +3,7 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a AS ksrc +FROM linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 AS ksrc # Extract headers and compile module FROM linuxkit/kernel:6.6.13-builder AS build diff --git a/test/cases/020_kernel/119_kmod_6.6.x/test.yml b/test/cases/020_kernel/119_kmod_6.6.x/test.yml index 1e97d6583..4eeaa00a4 100644 --- a/test/cases/020_kernel/119_kmod_6.6.x/test.yml +++ b/test/cases/020_kernel/119_kmod_6.6.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:6.6.13-e274bc71d6552570c922d2fca6c6481d1f9f045a + image: linuxkit/kernel:6.6.13-44a5293614ca7c7674013e928cb11dcdbba73ba8 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:07d37c3ae7fad5ddcb54c8dc65774ae050851f04