kernel: Simplify/restructure Dockerfile

- Use a RUN command per artefact created
- Use WORKDIR to avoid "cd /linux" on every RUN command
- Copy all relevant build artefacts to /out
- Only create one additional layer in final stage
- Add System.map to output image

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-05-01 11:25:02 +01:00
parent 34d508562d
commit 5ab5f31e14

View File

@ -20,28 +20,35 @@ RUN if [ $DEBUG -ne "0" ]; then \
# Apply local patches # Apply local patches
COPY patches-${KERNEL_SERIES} /patches COPY patches-${KERNEL_SERIES} /patches
RUN cd /linux && \ WORKDIR /linux
set -e && for patch in /patches/*.patch; do \ RUN set -e && for patch in /patches/*.patch; do \
echo "Applying $patch"; \ echo "Applying $patch"; \
patch -p1 < "$patch"; \ patch -p1 < "$patch"; \
done done
RUN cd /linux && \ RUN mkdir /out
make defconfig && \
# Kernel
RUN make defconfig && \
make oldconfig && \ make oldconfig && \
make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \
RUN cd /linux && \ cp arch/x86_64/boot/bzImage /out/kernel && \
make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \ cp System.map /out
# Modules
RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install && \
( DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \ ( DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \
cd /tmp/kernel-modules/lib/modules/$DVER && \ cd /tmp/kernel-modules/lib/modules/$DVER && \
rm build source && \ rm build source && \
ln -s /usr/src/linux-headers-$DVER build ) && \ ln -s /usr/src/linux-headers-$DVER build ) && \
mkdir -p /tmp/kernel-headers/usr && \ ( cd /tmp/kernel-modules && tar cf /out/kernel.tar lib )
make INSTALL_HDR_PATH=/tmp/kernel-headers/usr headers_install && \
( cd /tmp/kernel-headers && tar cf /kernel-headers.tar usr ) && \
( cd /tmp/kernel-modules && tar cf /kernel-modules.tar lib ) && \
cp vmlinux arch/x86_64/boot/bzImage /
# Headers (userspace API)
RUN mkdir -p /tmp/kernel-headers/usr && \
make INSTALL_HDR_PATH=/tmp/kernel-headers/usr headers_install && \
( cd /tmp/kernel-headers && tar cf /out/kernel-headers.tar usr )
# Headers (kernel development)
RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdepth 1)) && \
dir=/tmp/usr/src/linux-headers-$DVER && \ dir=/tmp/usr/src/linux-headers-$DVER && \
mkdir -p $dir && \ mkdir -p $dir && \
@ -49,17 +56,13 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept
cd /linux && \ cd /linux && \
cp -a include "$dir" && \ cp -a include "$dir" && \
mkdir -p "$dir"/arch/x86 && cp -a arch/x86/include "$dir"/arch/x86/ && \ mkdir -p "$dir"/arch/x86 && cp -a arch/x86/include "$dir"/arch/x86/ && \
( cd /tmp && tar cf /kernel-dev.tar usr/src ) ( cd /tmp && tar cf /out/kernel-dev.tar usr/src )
RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /kernel-source-info RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info
FROM linuxkit/toybox-media:eee3dd4d72cd784801e95b1781e6c4f9d8a5e5eb@sha256:7f940e687164ee2676e11c61705c79f7dd2d144ee87ad17a494848a7045f5f53 FROM linuxkit/toybox-media:eee3dd4d72cd784801e95b1781e6c4f9d8a5e5eb@sha256:7f940e687164ee2676e11c61705c79f7dd2d144ee87ad17a494848a7045f5f53
ENTRYPOINT [] ENTRYPOINT []
CMD [] CMD []
WORKDIR / WORKDIR /
COPY --from=kernel-build bzImage /kernel COPY --from=kernel-build /out/* /
COPY --from=kernel-build kernel-headers.tar /
COPY --from=kernel-build kernel-modules.tar /kernel.tar
COPY --from=kernel-build kernel-dev.tar /
COPY --from=kernel-build kernel-source-info /