mirror of
https://github.com/edera-dev/sprout.git
synced 2025-12-19 10:10:17 +00:00
chore(dev): make alpine boot fully clean with kernel module infra
This commit is contained in:
@@ -40,9 +40,9 @@ else
|
|||||||
set -- "${@}" -serial stdio
|
set -- "${@}" -serial stdio
|
||||||
else
|
else
|
||||||
set -- "${@}" \
|
set -- "${@}" \
|
||||||
-device virtio-serial-pci,id=vs0 \
|
-device 'virtio-serial-pci,id=vs0' \
|
||||||
-chardev stdio,id=stdio0,signal=off \
|
-chardev 'stdio,id=stdio0,signal=off' \
|
||||||
-device virtconsole,chardev=stdio0,id=console0
|
-device 'virtconsole,chardev=stdio0,id=console0,name=alpine'
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -64,8 +64,8 @@ fi
|
|||||||
|
|
||||||
if [ "${NO_NETWORK}" != "1" ]; then
|
if [ "${NO_NETWORK}" != "1" ]; then
|
||||||
set -- "${@}" \
|
set -- "${@}" \
|
||||||
-netdev user,id=network0 \
|
-netdev 'user,id=network0' \
|
||||||
-device virtio-net-pci,netdev=network0
|
-device 'virtio-net-pci,netdev=network0'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm -f "${FINAL_DIR}/ovmf-boot.fd"
|
rm -f "${FINAL_DIR}/ovmf-boot.fd"
|
||||||
@@ -76,7 +76,7 @@ fi
|
|||||||
# shellcheck disable=SC2086
|
# shellcheck disable=SC2086
|
||||||
set -- "${@}" \
|
set -- "${@}" \
|
||||||
-drive "if=pflash,file=${FINAL_DIR}/ovmf-boot.fd,format=raw,readonly=on" \
|
-drive "if=pflash,file=${FINAL_DIR}/ovmf-boot.fd,format=raw,readonly=on" \
|
||||||
-device nvme,drive=disk1,serial=cafebabe
|
-device 'nvme,drive=disk1,serial=cafebabe'
|
||||||
|
|
||||||
set -- "${@}" \
|
set -- "${@}" \
|
||||||
-drive "if=none,file=${FINAL_DIR}/sprout.img,format=raw,id=disk1,readonly=on"
|
-drive "if=none,file=${FINAL_DIR}/sprout.img,format=raw,id=disk1,readonly=on"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ if [ "${SKIP_KERNEL_BUILD}" != "1" ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
copy_from_image "${DOCKER_PREFIX}/sprout-kernel-${TARGET_ARCH}" "kernel.efi" "${FINAL_DIR}/kernel.efi"
|
copy_from_image "${DOCKER_PREFIX}/sprout-kernel-${TARGET_ARCH}" "kernel.efi" "${FINAL_DIR}/kernel.efi"
|
||||||
|
copy_from_image "${DOCKER_PREFIX}/sprout-kernel-${TARGET_ARCH}" "kernel.modules.tgz" "${FINAL_DIR}/kernel.modules.tgz"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "${SKIP_VM_BUILD}" != "1" ]; then
|
if [ "${SKIP_VM_BUILD}" != "1" ]; then
|
||||||
@@ -80,8 +81,12 @@ if [ "${SKIP_VM_BUILD}" != "1" ]; then
|
|||||||
-f hack/dev/vm/Dockerfile.ovmf "${FINAL_DIR}"
|
-f hack/dev/vm/Dockerfile.ovmf "${FINAL_DIR}"
|
||||||
copy_from_image "${DOCKER_PREFIX}/sprout-ovmf-${TARGET_ARCH}" "ovmf.fd" "${FINAL_DIR}/ovmf.fd"
|
copy_from_image "${DOCKER_PREFIX}/sprout-ovmf-${TARGET_ARCH}" "ovmf.fd" "${FINAL_DIR}/ovmf.fd"
|
||||||
copy_from_image "${DOCKER_PREFIX}/sprout-ovmf-${TARGET_ARCH}" "shell.efi" "${FINAL_DIR}/shell.efi"
|
copy_from_image "${DOCKER_PREFIX}/sprout-ovmf-${TARGET_ARCH}" "shell.efi" "${FINAL_DIR}/shell.efi"
|
||||||
|
rm -rf "${FINAL_DIR}/initramfs.build"
|
||||||
|
mkdir -p "${FINAL_DIR}/initramfs.build"
|
||||||
|
cp -r "hack/dev/vm/files" "${FINAL_DIR}/initramfs.build/files"
|
||||||
|
cp "${FINAL_DIR}/kernel.modules.tgz" "${FINAL_DIR}/initramfs.build/kernel.modules.tgz"
|
||||||
docker build --platform="${DOCKER_TARGET}" -t "${DOCKER_PREFIX}/sprout-initramfs-${TARGET_ARCH}:${DOCKER_TAG}" \
|
docker build --platform="${DOCKER_TARGET}" -t "${DOCKER_PREFIX}/sprout-initramfs-${TARGET_ARCH}:${DOCKER_TAG}" \
|
||||||
-f hack/dev/vm/Dockerfile.initramfs "hack/dev/vm"
|
-f hack/dev/vm/Dockerfile.initramfs "${FINAL_DIR}/initramfs.build"
|
||||||
copy_from_image "${DOCKER_PREFIX}/sprout-initramfs-${TARGET_ARCH}" "initramfs" "${FINAL_DIR}/initramfs"
|
copy_from_image "${DOCKER_PREFIX}/sprout-initramfs-${TARGET_ARCH}" "initramfs" "${FINAL_DIR}/initramfs"
|
||||||
|
|
||||||
if [ -n "${SPROUT_XEN_EFI_OVERRIDE}" ]; then
|
if [ -n "${SPROUT_XEN_EFI_OVERRIDE}" ]; then
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ ENV BUILDPLATFORM=${BUILDPLATFORM}
|
|||||||
ENV TARGETPLATFORM=${TARGETPLATFORM}
|
ENV TARGETPLATFORM=${TARGETPLATFORM}
|
||||||
WORKDIR /build/src
|
WORKDIR /build/src
|
||||||
RUN /build/docker-build.sh
|
RUN /build/docker-build.sh
|
||||||
|
COPY --chown=build:build docker-install.sh /build/docker-install.sh
|
||||||
|
RUN /build/docker-install.sh
|
||||||
|
|
||||||
FROM scratch AS final
|
FROM scratch AS final
|
||||||
COPY --from=build /build/src/kernel.image /kernel.efi
|
COPY --from=build /build/src/kernel.image /kernel.efi
|
||||||
|
COPY --from=build /build/src/kernel.modules.tgz /kernel.modules.tgz
|
||||||
|
|||||||
@@ -28,13 +28,17 @@ else
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo "CROSS_COMPILE=${MAYBE_CROSS_COMPILE}" > kernel.buildenv
|
||||||
|
echo "TARGET_KARCH=${TARGET_KARCH}" >> kernel.buildenv
|
||||||
|
|
||||||
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" defconfig
|
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" defconfig
|
||||||
if [ "${TARGET_KARCH}" = "x86_64" ]; then
|
if [ "${TARGET_KARCH}" = "x86_64" ]; then
|
||||||
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" xen.config
|
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" xen.config
|
||||||
./scripts/config -e XEN_PV
|
./scripts/config -e XEN_PV
|
||||||
./scripts/config -e XEN_PV_DOM0
|
./scripts/config -e XEN_PV_DOM0
|
||||||
fi
|
fi
|
||||||
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" mod2yesconfig
|
|
||||||
|
./scripts/config -e BPF_SYSCALL
|
||||||
|
|
||||||
./scripts/config -e UEVENT_HELPER
|
./scripts/config -e UEVENT_HELPER
|
||||||
./scripts/config --set-str UEVENT_HELPER_PATH "/sbin/hotplug"
|
./scripts/config --set-str UEVENT_HELPER_PATH "/sbin/hotplug"
|
||||||
@@ -46,8 +50,11 @@ make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" mod2yesconfig
|
|||||||
|
|
||||||
./scripts/config -e XEN_DOM0
|
./scripts/config -e XEN_DOM0
|
||||||
|
|
||||||
|
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" mod2noconfig
|
||||||
|
|
||||||
make "-j$(nproc)" CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}"
|
make "-j$(nproc)" CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}"
|
||||||
|
|
||||||
[ -f "arch/x86/boot/bzImage" ] && cp "arch/x86/boot/bzImage" kernel.image
|
[ -f "arch/x86/boot/bzImage" ] && cp "arch/x86/boot/bzImage" kernel.image
|
||||||
[ -f "arch/arm64/boot/Image.gz" ] && gzip -d <"arch/arm64/boot/Image.gz" >kernel.image
|
[ -f "arch/arm64/boot/Image.gz" ] && gzip -d <"arch/arm64/boot/Image.gz" >kernel.image
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
11
hack/dev/kernel/docker-install.sh
Executable file
11
hack/dev/kernel/docker-install.sh
Executable file
@@ -0,0 +1,11 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
. /build/src/kernel.buildenv
|
||||||
|
|
||||||
|
[ -f "arch/x86/boot/bzImage" ] && cp "arch/x86/boot/bzImage" kernel.image
|
||||||
|
[ -f "arch/arm64/boot/Image.gz" ] && gzip -d <"arch/arm64/boot/Image.gz" >kernel.image
|
||||||
|
|
||||||
|
make CROSS_COMPILE="${MAYBE_CROSS_COMPILE}" ARCH="${TARGET_KARCH}" INSTALL_MOD_PATH="/build/install" modules_install
|
||||||
|
cd /build/install
|
||||||
|
tar czpf /build/src/kernel.modules.tgz .
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS rootfs
|
FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS rootfs
|
||||||
RUN apk --no-cache add alpine-base tzdata ifupdown-ng agetty
|
RUN apk --no-cache add alpine-base tzdata wireless-regdb ifupdown-ng agetty
|
||||||
RUN rc-update add devfs sysinit && \
|
RUN rc-update add devfs sysinit && \
|
||||||
rc-update add dmesg sysinit && \
|
rc-update add dmesg sysinit && \
|
||||||
rc-update add mdev sysinit && \
|
rc-update add mdev sysinit && \
|
||||||
@@ -18,6 +18,7 @@ RUN rc-update add devfs sysinit && \
|
|||||||
rm /etc/motd && \
|
rm /etc/motd && \
|
||||||
ln -s /usr/share/zoneinfo/UTC /etc/localtime && \
|
ln -s /usr/share/zoneinfo/UTC /etc/localtime && \
|
||||||
echo 'hvc0::respawn:/sbin/agetty --autologin root -L hvc0 115200 vt100' >> /etc/inittab
|
echo 'hvc0::respawn:/sbin/agetty --autologin root -L hvc0 115200 vt100' >> /etc/inittab
|
||||||
|
ADD kernel.modules.tgz /
|
||||||
COPY files/interfaces /etc/network/interfaces
|
COPY files/interfaces /etc/network/interfaces
|
||||||
|
|
||||||
FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS build
|
FROM alpine:3.22@sha256:4b7ce07002c69e8f3d704a9c5d6fd3053be500b7f1c69fc0d80990c2ad8dd412 AS build
|
||||||
|
|||||||
Reference in New Issue
Block a user