Merge pull request #3998 from deitch/missing-builder-label-on-kernel

in kernel build, have ARG in correct place to be usable
linuxkit · Mar 3, 2024 · de69789 · de69789
2 parents 10e6d57 + a40251b
commit de69789
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/kernel/Dockerfile b/kernel/Dockerfile
@@ -178,8 +178,8 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept
 
 RUN printf "${BUILD_IMAGE}" > /out/kernel-builder
 
-ARG BUILD_IMAGE
 FROM scratch
+ARG BUILD_IMAGE
 ENTRYPOINT []
 CMD []
 WORKDIR /

diff --git a/test/cases/020_kernel/tags.sh b/test/cases/020_kernel/tags.sh
@@ -62,6 +62,7 @@ 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
+    [ "$ARCH" = "unknown" ] && continue
     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')