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

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

Browse Source 
in kernel build, have ARG in correct place to be usable
This commit is contained in:
Avi Deitcher 2024-03-03 01:50:38 -08:00 committed by GitHub
commit de6978908f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/Dockerfile
View File

@ -178,8 +178,8 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept
RUN printf "${BUILD_IMAGE}" > /out/kernel-builder RUN printf "${BUILD_IMAGE}" > /out/kernel-builder
ARG BUILD_IMAGE
FROM scratch FROM scratch
ARG BUILD_IMAGE
ENTRYPOINT [] ENTRYPOINT []
CMD [] CMD []
WORKDIR / WORKDIR /

1
test/cases/020_kernel/tags.sh
View File

@ -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 # 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 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_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') BUILDER_LABEL_ARCH_DIGEST=$(echo ${BUILDER_LABEL_MANIFEST} | jq -r --arg ARCH "$ARCH" '.[] | select (.platform.architecture == $ARCH) | .digest')