From 1337e07d3e704a5b4ecc42bf1c6c4a6c22adad6f Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 25 May 2021 23:03:23 +0100 Subject: [PATCH 01/10] kernel: Remove 4.19 patches Must have missed those when removing 4.19 support in f9f85bd4b3e4 ("kernel: Remove older LTS kernels") Signed-off-by: Rolf Neugebauer --- ...-fallback-definitions-for-GELF_ST_VI.patch | 53 ------------------ ...ux-swab-Fix-potentially-missing-__al.patch | 55 ------------------- 2 files changed, 108 deletions(-) delete mode 100644 kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch delete mode 100644 kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch diff --git a/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch b/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch deleted file mode 100644 index 528139aed..000000000 --- a/kernel/patches-4.19.x/0001-perf-symbols-Add-fallback-definitions-for-GELF_ST_VI.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1732ff11640d5fefb35083ad0d6bc016f2fd407c Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo -Date: Mon, 4 Feb 2019 15:48:03 -0300 -Subject: [PATCH 1/2] perf symbols: Add fallback definitions for - GELF_ST_VISIBILITY() - -Those aren't present in Alpine Linux 3.4 to edge, so provide fallback -defines to get the next patch building there keeping the build -bisectable. - -Cc: Adrian Hunter -Cc: Alexander Shishkin -Cc: Jiri Olsa -Cc: Masami Hiramatsu -Cc: Michael Petlan -Cc: Namhyung Kim -Cc: Nick Clifton -Cc: Peter Zijlstra -Link: https://lkml.kernel.org/n/tip-03cg3gya2ju4ba2x6ibb9fuz@git.kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -(cherry picked from commit 843cf70ed29a7fb51f1e796c1d6e1ba3620250ac) ---- - tools/perf/util/symbol-elf.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c -index a701a8a48f00..dc3fbcbb0e79 100644 ---- a/tools/perf/util/symbol-elf.c -+++ b/tools/perf/util/symbol-elf.c -@@ -19,6 +19,20 @@ - #define EM_AARCH64 183 /* ARM 64 bit */ - #endif - -+#ifndef ELF32_ST_VISIBILITY -+#define ELF32_ST_VISIBILITY(o) ((o) & 0x03) -+#endif -+ -+/* For ELF64 the definitions are the same. */ -+#ifndef ELF64_ST_VISIBILITY -+#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o) -+#endif -+ -+/* How to extract information held in the st_other field. */ -+#ifndef GELF_ST_VISIBILITY -+#define GELF_ST_VISIBILITY(val) ELF64_ST_VISIBILITY (val) -+#endif -+ - typedef Elf64_Nhdr GElf_Nhdr; - - #ifdef HAVE_CPLUS_DEMANGLE_SUPPORT --- -2.26.2 - diff --git a/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch b/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch deleted file mode 100644 index a7c1529a9..000000000 --- a/kernel/patches-4.19.x/0002-include-uapi-linux-swab-Fix-potentially-missing-__al.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d5f2496c154d54f8760aa273384f49c4adfd8704 Mon Sep 17 00:00:00 2001 -From: Matt Redfearn -Date: Wed, 3 Jan 2018 09:57:30 +0000 -Subject: [PATCH 2/2] include/uapi/linux/swab: Fix potentially missing - __always_inline -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining -of some byteswap operations") added __always_inline to swab functions -and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to -userspace headers") added a definition of __always_inline for use in -exported headers when the kernel's compiler.h is not available. - -However, since swab.h does not include stddef.h, if the header soup does -not indirectly include it, the definition of __always_inline is missing, -resulting in a compilation failure, which was observed compiling the -perf tool using exported headers containing this commit: - -In file included from /usr/include/linux/byteorder/little_endian.h:12:0, - from /usr/include/asm/byteorder.h:14, - from tools/include/uapi/linux/perf_event.h:20, - from perf.h:8, - from builtin-bench.c:18: -/usr/include/linux/swab.h:160:8: error: unknown type name ‘__always_inline’ - static __always_inline __u16 __swab16p(const __u16 *p) - -Fix this by replacing the inclusion of linux/compiler.h with -linux/stddef.h to ensure that we pick up that definition if required, -without relying on it's indirect inclusion. compiler.h is then included -indirectly, via stddef.h. - -Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers") -Signed-off-by: Matt Redfearn ---- - include/uapi/linux/swab.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h -index 7272f85d6d6a..3736f2fe1541 100644 ---- a/include/uapi/linux/swab.h -+++ b/include/uapi/linux/swab.h -@@ -3,7 +3,7 @@ - #define _UAPI_LINUX_SWAB_H - - #include --#include -+#include - #include - #include - --- -2.26.2 - From fb283d2bafc6827e291e30c0c6cc620d70bb4d8a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 25 May 2021 23:00:43 +0100 Subject: [PATCH 02/10] kernel: Remove out of kernel WireGuard build 5.4.x is the only kernel left which does not have WireGuard in tree and it people should be using more recent kernels. Remove the now special case for compiling out of tree WireGuard. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 66fcc4647..4c7308eec 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -40,10 +40,6 @@ ARG KERNEL_SERIES ARG EXTRA ARG DEBUG -ENV WIREGUARD_VERSION=v1.0.20210219 -ENV WIREGUARD_SHA256="11a75cf2387b6bb227c96241c911b5f48475def1ac84d0e758793cf9e677a6f0" -ENV WIREGUARD_URL=https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${WIREGUARD_VERSION}.tar.xz - # We copy the entire directory. This copies some unneeded files, but # allows us to check for the existence /patches-${KERNEL_SERIES} to # build kernels without patches. @@ -167,18 +163,8 @@ RUN case $(uname -m) in \ cp System.map /out && \ ([ -n "${DEBUG}" ] && cp vmlinux /out || true) -# WireGuard (skip kernels which have it in tree) -RUN if [ ! -d /linux/drivers/net/wireguard ]; then \ - curl -fsSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \ - echo "${WIREGUARD_SHA256} /wireguard.tar.xz" | sha256sum -c - && \ - cp /wireguard.tar.xz /out/src/ && \ - tar -C / --one-top-level=wireguard --strip-components=2 -xJf /wireguard.tar.xz "wireguard-linux-compat-${WIREGUARD_VERSION}/src" && \ - make -j "$(getconf _NPROCESSORS_ONLN)" M="/wireguard" modules; \ - fi - # Modules and Device Tree binaries RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \ - make INSTALL_MOD_PATH=/tmp/kernel-modules M="/wireguard" modules_install && \ ( DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \ cd /tmp/kernel-modules/lib/modules/$DVER && \ rm build source && \ From 9c7f158bd1959441a49b58b8139fb0ed75e5c667 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 25 May 2021 23:07:43 +0100 Subject: [PATCH 03/10] kernel: Fix KERNEL_SOURCE Declare KERNEL_SOURCE as an environment variable so it get's picked up in kernel-source-info fixes #3653 Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index 4c7308eec..fb4998d45 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -45,6 +45,8 @@ ARG DEBUG # build kernels without patches. COPY / / +RUN mkdir -p /out/src + # Download and verify kernel # PGP keys: 589DA6B1 (greg@kroah.com) & 6092693E (autosigner@kernel.org) & 00411886 (torvalds@linux-foundation.org) RUN KERNEL_MAJOR=$(echo ${KERNEL_VERSION} | cut -d . -f 1) && \ @@ -61,10 +63,8 @@ RUN KERNEL_MAJOR=$(echo ${KERNEL_VERSION} | cut -d . -f 1) && \ xz -d linux-${KERNEL_VERSION}.tar.xz && \ curl -fsSLO ${KERNEL_PGP2_SIGN} && \ gpg2 --verify linux-${KERNEL_VERSION}.tar.sign linux-${KERNEL_VERSION}.tar && \ - cat linux-${KERNEL_VERSION}.tar | tar --absolute-names -x && mv /linux-${KERNEL_VERSION} /linux - - -RUN mkdir -p /out/src + cat linux-${KERNEL_VERSION}.tar | tar --absolute-names -x && mv /linux-${KERNEL_VERSION} /linux && \ + printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info WORKDIR /tmp # Download Intel ucode, create a CPIO archive for it, and keep it in the build context @@ -103,8 +103,6 @@ RUN set -e && \ done; \ fi - - # Save kernel source RUN tar cJf /out/src/linux.tar.xz /linux @@ -196,7 +194,6 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept tar cf - -T - | (cd $dir; tar xf -) && \ ( cd /tmp && tar cf /out/kernel-dev.tar usr/src ) -RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info RUN printf "${BUILD_IMAGE}" > /out/kernel-builder LABEL org.mobyproject.linuxkit.kernel.buildimage ${BUILD_IMAGE} From 2c728f89d94fb50001b0917623a61f701b927aa5 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 25 May 2021 23:16:40 +0100 Subject: [PATCH 04/10] kernel: Update to 5.11.22/5.10.39/5.4.121 Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 16 ++++++++-------- kernel/config-5.10.x-aarch64 | 2 +- kernel/config-5.10.x-s390x | 2 +- kernel/config-5.10.x-x86_64 | 2 +- kernel/config-5.11.x-aarch64 | 2 +- kernel/config-5.11.x-s390x | 2 +- kernel/config-5.11.x-x86_64 | 2 +- kernel/config-5.4.x-x86_64 | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index 54a22cb20..f0c86f9eb 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -265,20 +265,20 @@ endef # Debug targets only for latest stable and LTS stable # ifeq ($(ARCH),x86_64) -$(eval $(call kernel,5.11.18,5.11.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,5.10.34,5.10.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,5.10.34,5.10.x,,-dbg)) -$(eval $(call kernel,5.4.116,5.4.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.10.39,5.10.x,,-dbg)) +$(eval $(call kernel,5.4.121,5.4.x,$(EXTRA),$(DEBUG))) #$(eval $(call kernel,5.4.28,5.4.x,-rt,)) else ifeq ($(ARCH),$(filter $(ARCH),aarch64 arm64)) -$(eval $(call kernel,5.11.18,5.11.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,5.10.34,5.10.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG))) #$(eval $(call kernel,5.4.28,5.4.x,-rt,)) else ifeq ($(ARCH),s390x) -$(eval $(call kernel,5.11.18,5.11.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,5.10.34,5.10.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.11.22,5.11.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,5.10.39,5.10.x,$(EXTRA),$(DEBUG))) endif # Target for kernel config diff --git a/kernel/config-5.10.x-aarch64 b/kernel/config-5.10.x-aarch64 index c719fd485..b20f41f72 100644 --- a/kernel/config-5.10.x-aarch64 +++ b/kernel/config-5.10.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.10.34 Kernel Configuration +# Linux/arm64 5.10.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" CONFIG_CC_IS_GCC=y diff --git a/kernel/config-5.10.x-s390x b/kernel/config-5.10.x-s390x index cfc402f04..43c555033 100644 --- a/kernel/config-5.10.x-s390x +++ b/kernel/config-5.10.x-s390x @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.10.34 Kernel Configuration +# Linux/s390 5.10.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" CONFIG_CC_IS_GCC=y diff --git a/kernel/config-5.10.x-x86_64 b/kernel/config-5.10.x-x86_64 index d54e5b6c3..e40a89100 100644 --- a/kernel/config-5.10.x-x86_64 +++ b/kernel/config-5.10.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.34 Kernel Configuration +# Linux/x86 5.10.39 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" CONFIG_CC_IS_GCC=y diff --git a/kernel/config-5.11.x-aarch64 b/kernel/config-5.11.x-aarch64 index bb02fa35b..0094c00ac 100644 --- a/kernel/config-5.11.x-aarch64 +++ b/kernel/config-5.11.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.11.18 Kernel Configuration +# Linux/arm64 5.11.22 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" CONFIG_CC_IS_GCC=y diff --git a/kernel/config-5.11.x-s390x b/kernel/config-5.11.x-s390x index 7836a2ec8..3fb1b4b54 100644 --- a/kernel/config-5.11.x-s390x +++ b/kernel/config-5.11.x-s390x @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 5.11.18 Kernel Configuration +# Linux/s390 5.11.22 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" CONFIG_CC_IS_GCC=y diff --git a/kernel/config-5.11.x-x86_64 b/kernel/config-5.11.x-x86_64 index 50bd44d83..975a85daf 100644 --- a/kernel/config-5.11.x-x86_64 +++ b/kernel/config-5.11.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.11.18 Kernel Configuration +# Linux/x86 5.11.22 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Alpine 10.2.1_pre1) 10.2.1 20201203" CONFIG_CC_IS_GCC=y diff --git a/kernel/config-5.4.x-x86_64 b/kernel/config-5.4.x-x86_64 index 22ecb1765..82250b545 100644 --- a/kernel/config-5.4.x-x86_64 +++ b/kernel/config-5.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.4.116 Kernel Configuration +# Linux/x86 5.4.121 Kernel Configuration # # From c25cc376434ee9071effd0be20c3a380c847c458 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 26 May 2021 01:11:47 +0100 Subject: [PATCH 05/10] kernel: Remove remnants of DOCKER_CONTENT_TRUST Signed-off-by: Rolf Neugebauer --- kernel/Makefile | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/kernel/Makefile b/kernel/Makefile index f0c86f9eb..e042007d9 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -125,21 +125,21 @@ push_$(2)$(3)$(4): notdirty build_$(2)$(3)$(4) (docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST)) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)) forcepush_$(2)$(3)$(4): notdirty forcebuild_$(2)$(3)$(4) docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4) # tag the builder and create the manifest tagbuilder_$(2)$(3)$(4): notdirty docker tag $(IMAGE_BUILDER) $(ORG)/$(IMAGE):$(1)$(3)$(4)-builder$(SUFFIX) && \ docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)-builder$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-builder $(DOCKER_CONTENT_TRUST) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-builder show-tag_$(2)$(3)$(4): @@ -154,26 +154,18 @@ forcepush_image: forcepush_$(2)$(3)$(4) tagbuilder: tagbuilder_$(2)$(3)$(4) show-tags: show-tag_$(2)$(3)$(4) -# FIXME: We no longer use DOCKER_CONENT_TRUST=1 -# -# 'docker build' with the FROM image supplied as --build-arg -# *and* with DOCKER_CONTENT_TRUST=1 currently does not work -# (https://github.com/moby/moby/issues/34199). So, we pull the image -# with DCT as part of the dependency on build_$(2)$(3)$(4) and then build -# with DOCKER_CONTENT_TRUST explicitly set to 0 - # Only build perf only on x86 and recent LTS and latest stable kernels ifeq ($(ARCH),x86_64) ifeq ($(2), $(filter $(2),5.11.x 5.10.x 5.4.x)) build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ - DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \ + docker build -f Dockerfile.perf \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) \ --build-arg BUILD_IMAGE=$(IMAGE_BUILDER) \ --no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) . forcebuild_perf_$(2)$(3)$(4): build_$(2)$(3)$(4) - DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \ + docker build -f Dockerfile.perf \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) \ --build-arg BUILD_IMAGE=$(IMAGE_BUILDER) \ --no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) . @@ -183,15 +175,15 @@ push_perf_$(2)$(3)$(4): notdirty build_perf_$(2)$(3)$(4) (docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST)) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)) forcepush_perf_$(2)$(3)$(4): notdirty forcebuild_perf_$(2)$(3)$(4) docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4) build: build_perf_$(2)$(3)$(4) forcebuild: forcebuild_perf_$(2)$(3)$(4) @@ -205,13 +197,13 @@ ifeq ($(ARCH),x86_64) ifeq ($(2), $(filter $(2),5.11.x 5.10.x 5.4.x)) build_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4) docker pull $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \ - DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \ + docker build -f Dockerfile.bcc \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) \ --build-arg BUILD_IMAGE=$(IMAGE_BUILDER) \ --no-cache $(LABEL) -t $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) . forcebuild_bcc_$(2)$(3)$(4): build_$(2)$(3)$(4) - DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.bcc \ + docker build -f Dockerfile.bcc \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) \ --build-arg BUILD_IMAGE=$(IMAGE_BUILDER) \ --no-cache $(LABEL) -t $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) . @@ -221,15 +213,15 @@ push_bcc_$(2)$(3)$(4): notdirty build_bcc_$(2)$(3)$(4) (docker push $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST)) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)) forcepush_bcc_$(2)$(3)$(4): notdirty forcebuild_bcc_$(2)$(3)$(4) docker push $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_BCC):$(1)$(3)$(4) # Disable bcc build as it is failing: https://github.com/linuxkit/linuxkit/issues/3652 # build: build_bcc_$(2)$(3)$(4) @@ -244,7 +236,7 @@ ifeq ($(4),) # is incompatible with CDDL, apparently (this is ./configure check) build_zfs_$(2)$(3): build_$(2)$(3) docker pull $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) || \ - DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.zfs \ + docker build -f Dockerfile.zfs \ --build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) \ --build-arg BUILD_IMAGE=$(IMAGE_BUILDER) \ --no-cache $(LABEL) -t $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) . @@ -254,8 +246,8 @@ push_zfs_$(2)$(3): notdirty build_zfs_$(2)$(3) (docker push $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) && \ docker tag $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_ZFS):$(1)$(3)$(SUFFIX) && \ docker push $(ORG)/$(IMAGE_ZFS):$(1)$(3)$(SUFFIX) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG) $(DOCKER_CONTENT_TRUST) && \ - $(PUSH_MANIFEST) $(ORG)/$(IMAGE_ZFS):$(1)$(3) $(DOCKER_CONTENT_TRUST)) + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_ZFS):$(1)$(3)-$(TAG) && \ + $(PUSH_MANIFEST) $(ORG)/$(IMAGE_ZFS):$(1)$(3)) endif endef From 70ac373206642339ff5cc9e9b091723156082499 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Wed, 26 May 2021 12:42:49 +0100 Subject: [PATCH 06/10] kernel: Fix ARG handling in Dockerfiles At least for the perf image I got an error when not having the ARG up front. Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile.bcc | 3 ++- kernel/Dockerfile.kconfig | 4 ++-- kernel/Dockerfile.perf | 3 ++- kernel/Dockerfile.zfs | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/kernel/Dockerfile.bcc b/kernel/Dockerfile.bcc index 95114f5d4..f84a8425d 100644 --- a/kernel/Dockerfile.bcc +++ b/kernel/Dockerfile.bcc @@ -1,7 +1,8 @@ ARG IMAGE +ARG BUILD_IMAGE + FROM ${IMAGE} as ksrc -ARG BUILD_IMAGE FROM ${BUILD_IMAGE} AS build RUN apk update && apk upgrade -a && \ apk add --no-cache \ diff --git a/kernel/Dockerfile.kconfig b/kernel/Dockerfile.kconfig index 9a89ccd92..3858fea96 100644 --- a/kernel/Dockerfile.kconfig +++ b/kernel/Dockerfile.kconfig @@ -1,4 +1,6 @@ ARG BUILD_IMAGE +ARG KERNEL_VERSIONS + FROM ${BUILD_IMAGE} AS kernel-build RUN apk add \ argp-standalone \ @@ -15,8 +17,6 @@ RUN apk add \ patch \ xz -ARG KERNEL_VERSIONS - COPY / / # Unpack kernels (download if not present) diff --git a/kernel/Dockerfile.perf b/kernel/Dockerfile.perf index c6444d5c4..ec906ee89 100644 --- a/kernel/Dockerfile.perf +++ b/kernel/Dockerfile.perf @@ -1,9 +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 IMAGE +ARG BUILD_IMAGE + FROM ${IMAGE} AS ksrc -ARG BUILD_IMAGE FROM ${BUILD_IMAGE} AS build RUN apk add \ argp-standalone \ diff --git a/kernel/Dockerfile.zfs b/kernel/Dockerfile.zfs index 8729c54e9..caae046c9 100644 --- a/kernel/Dockerfile.zfs +++ b/kernel/Dockerfile.zfs @@ -1,7 +1,8 @@ ARG IMAGE +ARG BUILD_IMAGE + FROM ${IMAGE} AS ksrc -ARG BUILD_IMAGE FROM ${BUILD_IMAGE} AS build RUN apk add \ attr-dev \ From 5f959a9bcd246eba2852d5482c77b464ba389d42 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 27 May 2021 08:25:45 +0000 Subject: [PATCH 07/10] kernel: Move build label add to Makefile where the other labels are defined Signed-off-by: Rolf Neugebauer --- kernel/Dockerfile | 1 - kernel/Makefile | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/Dockerfile b/kernel/Dockerfile index fb4998d45..1a369b6bb 100644 --- a/kernel/Dockerfile +++ b/kernel/Dockerfile @@ -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 ) RUN printf "${BUILD_IMAGE}" > /out/kernel-builder -LABEL org.mobyproject.linuxkit.kernel.buildimage ${BUILD_IMAGE} FROM scratch ENTRYPOINT [] diff --git a/kernel/Makefile b/kernel/Makefile index e042007d9..851293e9d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -55,6 +55,8 @@ endif TAG=$(HASH)$(DIRTY) +BUILD_LABEL=--label org.mobyproject.linuxkit.kernel.buildimage=$(IMAGE_BUILDER) + REPO?=https://github.com/linuxkit/linuxkit ifneq ($(REPO),) REPO_LABEL=--label org.opencontainers.image.source=$(REPO) @@ -63,7 +65,8 @@ ifeq ($(DIRTY),) REPO_COMMIT=$(shell git rev-parse HEAD) COMMIT_LABEL=--label org.opencontainers.image.revision=$(REPO_COMMIT) endif -LABELS=$(REPO_LABEL) $(COMMIT_LABEL) + +LABELS=$(REPO_LABEL) $(COMMIT_LABEL) $(BUILD_LABEL) KERNEL_VERSIONS= From 6b0e1b709d7f7d299a562036744f9eb05bcf2601 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 27 May 2021 08:26:48 +0000 Subject: [PATCH 08/10] tests: Copy kernel-builder from the correct location Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/tags.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/cases/020_kernel/tags.sh b/test/cases/020_kernel/tags.sh index bf8f69659..1c04fbdfc 100644 --- a/test/cases/020_kernel/tags.sh +++ b/test/cases/020_kernel/tags.sh @@ -36,7 +36,7 @@ BUILDERLABEL=$(docker inspect -f '{{index .Config.Labels "org.mobyproject.linuxk # create the container; /bin/sh does not exist, but that does not prevent us from indicating what the command # *would* be. Indeed, you *must* have a command for `docker create` to work ctrid=$(docker create $KERNEL /bin/sh) -docker cp ${ctrid}:/etc/kernel-builder ${BUILDERFILE} +docker cp ${ctrid}:/kernel-builder ${BUILDERFILE} FILECONTENTS=$(cat ${BUILDERFILE}) # get the manifests for the referenced tag and for the referenced builder. From 0e025d8fb9ccb814b91fb2df1595d9a12f7ab917 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Fri, 28 May 2021 09:18:12 +0100 Subject: [PATCH 09/10] Update YAMLs and tests to latest kernels Signed-off-by: Rolf Neugebauer --- examples/aws.yml | 2 +- examples/azure.yml | 2 +- examples/cadvisor.yml | 2 +- examples/dm-crypt-loop.yml | 2 +- examples/dm-crypt.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/gcp.yml | 2 +- examples/getty.yml | 2 +- examples/hetzner.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/logging.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/packet.arm64.yml | 2 +- examples/packet.yml | 2 +- examples/redis-os.yml | 2 +- examples/scaleway.yml | 2 +- examples/sshd.yml | 2 +- examples/static-ip.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vmware.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/vultr.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/000_build/010_reproducible/test.yml | 2 +- .../010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/010_platforms/110_gcp/000_run/test.yml | 2 +- test/cases/020_kernel/011_config_5.4.x/test.yml | 2 +- test/cases/020_kernel/013_config_5.10.x/test.yml | 2 +- test/cases/020_kernel/014_config_5.11.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/Dockerfile | 4 ++-- test/cases/020_kernel/111_kmod_5.4.x/test.sh | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- test/cases/020_kernel/113_kmod_5.10.x/Dockerfile | 4 ++-- test/cases/020_kernel/113_kmod_5.10.x/test.sh | 2 +- test/cases/020_kernel/113_kmod_5.10.x/test.yml | 2 +- test/cases/020_kernel/114_kmod_5.11.x/Dockerfile | 4 ++-- test/cases/020_kernel/114_kmod_5.11.x/test.sh | 2 +- test/cases/020_kernel/114_kmod_5.11.x/test.yml | 2 +- test/cases/020_kernel/200_namespace/common.yml | 2 +- test/cases/020_kernel/211_tags_5.4.x/test.sh | 2 +- test/cases/020_kernel/213_tags_5.10.x/test.sh | 2 +- test/cases/020_kernel/214_tags_5.11.x/test.sh | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 2 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/008_metadata/000_cidata/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/020_init_containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/cases/040_packages/030_logwrite/test.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 103 files changed, 106 insertions(+), 106 deletions(-) diff --git a/examples/aws.yml b/examples/aws.yml index 595488fd6..1f488328c 100644 --- a/examples/aws.yml +++ b/examples/aws.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/azure.yml b/examples/azure.yml index 1922d446c..4376b801d 100644 --- a/examples/azure.yml +++ b/examples/azure.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index f706c6d88..350d5b21a 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 37f9cb2e9..ea59271be 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index 24b963e30..1e47e26ab 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 0c207441a..bea86627e 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -1,6 +1,6 @@ # This is an example for building the open source components of Docker for Mac kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:b0a5ede4c53aa718b48fb9a86e4725ab6ae7f96e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host diff --git a/examples/docker.yml b/examples/docker.yml index f67dc478c..313242b4f 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/gcp.yml b/examples/gcp.yml index 14e59e482..9b47195ae 100644 --- a/examples/gcp.yml +++ b/examples/gcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/getty.yml b/examples/getty.yml index 853c571b2..728987f35 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/hetzner.yml b/examples/hetzner.yml index 5fe1f39a2..38a267dc1 100644 --- a/examples/hetzner.yml +++ b/examples/hetzner.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: console=ttyS1 ucode: intel-ucode.cpio init: diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index 62ee5f63e..c9fdd09e5 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 5610837ef..a50642a29 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/logging.yml b/examples/logging.yml index 19e6f8daa..3b487ee70 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -1,6 +1,6 @@ # Simple example of using an external logging service kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/minimal.yml b/examples/minimal.yml index e135215bd..849cf9e4a 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 3a454ded4..473a87303 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/openstack.yml b/examples/openstack.yml index d6d9eaf7b..68b42522f 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/packet.arm64.yml b/examples/packet.arm64.yml index bc68ddc53..5080cf784 100644 --- a/examples/packet.arm64.yml +++ b/examples/packet.arm64.yml @@ -5,7 +5,7 @@ # for arm64 then the 'ucode' line in the kernel section can be left # out. kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyAMA0" ucode: "" onboot: diff --git a/examples/packet.yml b/examples/packet.yml index 950960ba5..b9f2db0a4 100644 --- a/examples/packet.yml +++ b/examples/packet.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: console=ttyS1 ucode: intel-ucode.cpio init: diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 5c967679f..c9f1e7067 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -1,7 +1,7 @@ # Minimal YAML to run a redis server (used at DockerCon'17) # connect: nc localhost 6379 kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/scaleway.yml b/examples/scaleway.yml index 4ab013997..fe1f18a9e 100644 --- a/examples/scaleway.yml +++ b/examples/scaleway.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/sshd.yml b/examples/sshd.yml index 954d7af1a..6733e93a5 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/static-ip.yml b/examples/static-ip.yml index bdf24392f..3dadde910 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/swap.yml b/examples/swap.yml index 999adb08e..11abb2b95 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/tpm.yml b/examples/tpm.yml index 844178832..e5179409c 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/vmware.yml b/examples/vmware.yml index 49426ada7..b629795a9 100644 --- a/examples/vmware.yml +++ b/examples/vmware.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index b3ee68d98..67ed4e094 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 7a7bf8617..711e55596 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/vultr.yml b/examples/vultr.yml index d1d76b66e..3967f2cff 100644 --- a/examples/vultr.yml +++ b/examples/vultr.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 2092561e1..b339f70e7 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/linuxkit.yml b/linuxkit.yml index 298ae43f5..8ce0edd42 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 2f18671a4..4330ce976 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 690995ff5..799af5ab7 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index d3654dd3f..006619660 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 964a45adf..bd3239f8a 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index a3f543ff7..69223efd5 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -1,6 +1,6 @@ # NOTE: Images build from this file likely do not run kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index eebb3e8f0..2329f6ee5 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index eebb3e8f0..2329f6ee5 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index e495e6ea9..1b74611f1 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index 20175f65d..0bfc0d78e 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index cf4202400..680173283 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 91ebef11b..afe535ef9 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index 1dad875dd..dae05ef15 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.116 + image: linuxkit/kernel:5.4.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index 3d3ccbb16..79fb592f6 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/014_config_5.11.x/test.yml b/test/cases/020_kernel/014_config_5.11.x/test.yml index 030b9c043..a03e0248f 100644 --- a/test/cases/020_kernel/014_config_5.11.x/test.yml +++ b/test/cases/020_kernel/014_config_5.11.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.11.18 + image: linuxkit/kernel:5.11.22 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile index 78fbb7584..6cac05415 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile +++ b/test/cases/020_kernel/111_kmod_5.4.x/Dockerfile @@ -3,10 +3,10 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.4.116 AS ksrc +FROM linuxkit/kernel:5.4.121 AS ksrc # Extract headers and compile module -FROM linuxkit/kernel:5.4.116-builder AS build +FROM linuxkit/kernel:5.4.121-builder AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.sh b/test/cases/020_kernel/111_kmod_5.4.x/test.sh index 7fe083acc..d2fbd36af 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.sh +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.4.116 +docker pull linuxkit/kernel:5.4.121 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index ffa1f6649..742c93693 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.4.116 + image: linuxkit/kernel:5.4.121 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile b/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile index 0d14b1434..8857e04f5 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile +++ b/test/cases/020_kernel/113_kmod_5.10.x/Dockerfile @@ -3,10 +3,10 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.10.34 AS ksrc +FROM linuxkit/kernel:5.10.39 AS ksrc # Extract headers and compile module -FROM linuxkit/kernel:5.10.34-builder AS build +FROM linuxkit/kernel:5.10.39-builder AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.sh b/test/cases/020_kernel/113_kmod_5.10.x/test.sh index 0c7736c18..80a76e59c 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.sh +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.10.34 +docker pull linuxkit/kernel:5.10.39 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index 8ac0b6d4c..2646eb15a 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/114_kmod_5.11.x/Dockerfile b/test/cases/020_kernel/114_kmod_5.11.x/Dockerfile index cc6dfeac8..f904379f0 100644 --- a/test/cases/020_kernel/114_kmod_5.11.x/Dockerfile +++ b/test/cases/020_kernel/114_kmod_5.11.x/Dockerfile @@ -3,10 +3,10 @@ # In the last stage, it creates a package, which can be used for # testing. -FROM linuxkit/kernel:5.11.18 AS ksrc +FROM linuxkit/kernel:5.11.22 AS ksrc # Extract headers and compile module -FROM linuxkit/kernel:5.11.18-builder AS build +FROM linuxkit/kernel:5.11.22-builder AS build RUN apk add build-base elfutils-dev COPY --from=ksrc /kernel-dev.tar / diff --git a/test/cases/020_kernel/114_kmod_5.11.x/test.sh b/test/cases/020_kernel/114_kmod_5.11.x/test.sh index 31c6c3946..9fb037a37 100644 --- a/test/cases/020_kernel/114_kmod_5.11.x/test.sh +++ b/test/cases/020_kernel/114_kmod_5.11.x/test.sh @@ -19,7 +19,7 @@ clean_up() { trap clean_up EXIT # Make sure we have the latest kernel image -docker pull linuxkit/kernel:5.11.18 +docker pull linuxkit/kernel:5.11.22 # Build a package docker build -t ${IMAGE_NAME} . diff --git a/test/cases/020_kernel/114_kmod_5.11.x/test.yml b/test/cases/020_kernel/114_kmod_5.11.x/test.yml index 0524c25ef..8b3e028bc 100644 --- a/test/cases/020_kernel/114_kmod_5.11.x/test.yml +++ b/test/cases/020_kernel/114_kmod_5.11.x/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.11.18 + image: linuxkit/kernel:5.11.22 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index b75cdd5b8..92e479b81 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/020_kernel/211_tags_5.4.x/test.sh b/test/cases/020_kernel/211_tags_5.4.x/test.sh index c1af181c6..2fbce7cd2 100644 --- a/test/cases/020_kernel/211_tags_5.4.x/test.sh +++ b/test/cases/020_kernel/211_tags_5.4.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:5.4.116 +KERNEL=linuxkit/kernel:5.4.121 # just include the common test . ../tags.sh diff --git a/test/cases/020_kernel/213_tags_5.10.x/test.sh b/test/cases/020_kernel/213_tags_5.10.x/test.sh index ce3bc3124..2a8aa692c 100644 --- a/test/cases/020_kernel/213_tags_5.10.x/test.sh +++ b/test/cases/020_kernel/213_tags_5.10.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:5.10.34 +KERNEL=linuxkit/kernel:5.10.39 # just include the common test . ../tags.sh diff --git a/test/cases/020_kernel/214_tags_5.11.x/test.sh b/test/cases/020_kernel/214_tags_5.11.x/test.sh index 5d2d90b61..f59448c30 100644 --- a/test/cases/020_kernel/214_tags_5.11.x/test.sh +++ b/test/cases/020_kernel/214_tags_5.11.x/test.sh @@ -5,7 +5,7 @@ set -e -KERNEL=linuxkit/kernel:5.11.18 +KERNEL=linuxkit/kernel:5.11.22 # just include the common test . ../tags.sh diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 31f3a6eac..24e4bfce3 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 0459a398d..68cade4e2 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 1bceb22f4..edf0e1848 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 6207804a9..741a10204 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 57cfeeb7f..644e0c03d 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 48072f5c5..db79a5101 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 3763c5b16..965821b75 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index e585f0bd7..c19f7e8ef 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index 858427f82..60fb90f6f 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index d806e601c..b657206ad 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 48a0c3b36..17d8e4787 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index f1202403b..b7819cbbf 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 5bb689956..e02361fae 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index ad5dbe04a..ed7a0e55c 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index cd25174c4..7e3b0aac7 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 1abd7da5d..33f58dda1 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 5549d6103..a8ffb226d 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index f1202403b..b7819cbbf 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index a8fb469ab..75552c680 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index 9f1c3bae3..b296f8e2c 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 0a41129ca..61b4bbe1f 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index 5ac37b50a..9ebc5d879 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index abfbaa3c3..15141fa2b 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index df934939d..76474d0c8 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index ea4b4f661..703041657 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index e6fceab15..c3bc123c7 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 091f24053..20d2314b1 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index 08ebadf4d..3a93727d5 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index fa7059f80..175599559 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 2bd34c8c8..de2909065 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 24f220efd..7087d7bb2 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 9c7f13c25..1632df14d 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml index 7663c8a56..ee895a46e 100644 --- a/test/cases/040_packages/020_init_containerd/test.yml +++ b/test/cases/040_packages/020_init_containerd/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index b19b18a56..f1d0ccb17 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index f639600f9..786bf8661 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 01677162d..bab2dc289 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index 7994246f4..29687cddb 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 8ce485957..5d4b4a601 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -1,5 +1,5 @@ kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/hack/test.yml b/test/hack/test.yml index 815c4dc22..afc1c7b3c 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -1,7 +1,7 @@ # FIXME: This should use the minimal example # We continue to use the kernel-config-test as CI is currently expecting to see a success message kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 8b2bdecb1..23e3f37e6 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -1,6 +1,6 @@ # Sample YAML file for manual testing kernel: - image: linuxkit/kernel:5.10.34 + image: linuxkit/kernel:5.10.39 cmdline: "console=ttyS0" init: - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 From 0d8bb78f073d999a2c65d323a819e85737bf3298 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 1 Jun 2021 22:51:10 +0000 Subject: [PATCH 10/10] tests: Fix kernel builder tests Some kernels are only build for some architectures. The test assumed that all kernels were build for all architectures. Now, get a list of architectures for which we have a given kernel image and then make sure the builder images pointed to by the label and the builder image tagged by convention exist and point to the same thing. Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/tags.sh | 53 ++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/test/cases/020_kernel/tags.sh b/test/cases/020_kernel/tags.sh index 1c04fbdfc..123f6ab52 100644 --- a/test/cases/020_kernel/tags.sh +++ b/test/cases/020_kernel/tags.sh @@ -14,15 +14,15 @@ set -e . "${RT_PROJECT_ROOT}/_lib/lib.sh" if [ -z "${KERNEL}" ]; then - echo "KERNEL env var must be set" - exit 1 + echo "KERNEL env var must be set" + exit 1 fi NAME=tags clean_up() { - docker rm ${ctrid} - /bin/rm -f ${BUILDERFILE} + docker rm ${ctrid} + /bin/rm -f ${BUILDERFILE} } trap clean_up EXIT @@ -39,28 +39,47 @@ ctrid=$(docker create $KERNEL /bin/sh) docker cp ${ctrid}:/kernel-builder ${BUILDERFILE} FILECONTENTS=$(cat ${BUILDERFILE}) -# get the manifests for the referenced tag and for the referenced builder. -# these are not guaranated to be identical, since the orders can change. So we need to account for that. -sumtag=$(docker manifest inspect ${BUILDER} | jq -c '.manifests | sort_by(.digest)' | sha256sum | awk '{print $1}') -sumlabel=$(docker manifest inspect ${BUILDERLABEL} | jq -c '.manifests | sort_by(.digest)' | sha256sum | awk '{print $1}') +# Get a list of architectures for which we have this kernel +KERNEL_ARCHES=$(docker manifest inspect ${KERNEL} | jq -r -c '.manifests[].platform.architecture') + +# Get builder manifest +BUILDER_MANIFEST=$(docker manifest inspect ${BUILDER} | jq -c '.manifests') + +# Get the manifest of the builder pointed to by the label +BUILDER_LABEL_MANIFEST=$(docker manifest inspect ${BUILDERLABEL} | jq -c '.manifests') + # these two files should be identical echo "builder label: ${BUILDERLABEL}" echo "builder file: ${FILECONTENTS}" echo "builder tag: ${BUILDER}" -echo "builder tag sha256: ${sumtag}" -echo "builder label sha256: ${sumlabel}" # check that the label and file contents match if [ "${BUILDERLABEL}" != "${FILECONTENTS}" ]; then - echo "label vs file contents mismatch" - exit 1 -fi -# check that the tag actually points to the manifest -if [ "${sumtag}" != "${sumlabel}" ]; then - echo "tag ${BUILDER} and label ${BUILDERLABEL} have mismatched contents" - exit 1 + echo "label vs file contents mismatch" + exit 1 fi +# Check that for each architecture we have the kernel for builder and the builder label points to the same thing +for ARCH in ${KERNEL_ARCHES}; do + BUILDER_ARCH_DIGEST=$(echo ${BUILDER_MANIFEST} | jq -r --arg ARCH "$ARCH" '.[] | select (.platform.architecture == $ARCH) | .digest') + BUILDER_LABEL_ARCH_DIGEST=$(echo ${BUILDER_LABEL_MANIFEST} | jq -r --arg ARCH "$ARCH" '.[] | select (.platform.architecture == $ARCH) | .digest') + + if [ -z "${BUILDER_ARCH_DIGEST}" ]; then + echo "No Builder for ${ARCH} in manifest ${BUILDER}" + exit 1 + fi + if [ -z "${BUILDER_LABEL_ARCH_DIGEST}" ]; then + echo "No Builder for ${ARCH} in manifest ${BUILDERLABEL}" + exit 1 + fi + + if [ "${BUILDER_ARCH_DIGEST}" != "${BUILDER_LABEL_ARCH_DIGEST}" ]; then + echo "Builder digests for kernel ${KERNEL} arch ${ARCH} do not match ${BUILDER_ARCH_DIGEST} != ${BUILDER_LABEL_ARCH_DIGEST}" + exit 1 + fi + + echo "Builder tags/labels for kernel ${KERNEL} arch ${ARCH} match: ${BUILDER_ARCH_DIGEST} == ${BUILDER_LABEL_ARCH_DIGEST}" +done exit 0