mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
Merge pull request #3998 from deitch/missing-builder-label-on-kernel
in kernel build, have ARG in correct place to be usable
This commit is contained in:
commit
de6978908f
@ -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 /
|
||||
|
@ -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')
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user