feat(arm64): create docker image for mkimage-iso-bios (amd64)

SmartArray · SmartArray · commit 9a566ee8ca0f · 2025-02-07T07:39:30.000+01:00
Signed-off-by: Yoshi Jaeger &lt;github@jaeger.berlin&gt;
diff --git a/tools/mkimage-iso-bios/Dockerfile b/tools/mkimage-iso-bios/Dockerfile
@@ -1,16 +1,27 @@
+FROM --platform=linux/amd64 linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 as amd64-builder
+RUN apk add --no-cache syslinux
+RUN mkdir /amd64-out && \
+    cp /usr/share/syslinux/isolinux.bin /amd64-out/ && \
+    cp /usr/share/syslinux/ldlinux.c32 /amd64-out/ && \
+    cp /usr/bin/isohybrid /amd64-out/
+
 FROM linuxkit/alpine:e9313150d2cf07ad92b0adb86799dedd9a0476e4 as mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb -p /out \
     alpine-baselayout \
     busybox \
     cdrkit \
     libarchive-tools \
-    syslinux \
     && true
 RUN mv /out/etc/apk/repositories.upstream /out/etc/apk/repositories
 
 FROM scratch
 WORKDIR /
 COPY --from=mirror /out/ /
+RUN mkdir -p /isolinux
+COPY --from=amd64-builder /amd64-out/isolinux.bin /syslinux/
+COPY --from=amd64-builder /amd64-out/ldlinux.c32 /syslinux/
+COPY --from=amd64-builder /amd64-out/isohybrid /syslinux/
 COPY . .
 ENTRYPOINT [ "/make-iso" ]
+
diff --git a/tools/mkimage-iso-bios/build.yml b/tools/mkimage-iso-bios/build.yml
@@ -1,3 +1,4 @@
 image: mkimage-iso-bios
 arches:
   - amd64
+  - arm64
diff --git a/tools/mkimage-iso-bios/make-iso b/tools/mkimage-iso-bios/make-iso
@@ -14,12 +14,13 @@ cd /tmp/iso
 
 CMDLINE="$(cat boot/cmdline)"
 # if no root= root device specified, assume /dev/sr0 ie first CD drive
+
 echo "${CMDLINE}" | grep -q 'root=' || CMDLINE="${CMDLINE} root=/dev/sr0"
-rm boot/cmdline
+rm boot/cmdline 
 
 mkdir -p isolinux
-cp /usr/share/syslinux/isolinux.bin ./isolinux/
-cp /usr/share/syslinux/ldlinux.c32 ./isolinux/
+cp /syslinux/isolinux.bin ./isolinux/
+cp /syslinux/ldlinux.c32 ./isolinux/
 
 CFG="DEFAULT linux
 LABEL linux
@@ -36,6 +37,6 @@ genisoimage -o ../linuxkit-bios.iso -l -J -R \
 		-joliet-long -input-charset utf8 \
                 -V LinuxKit .
 
-isohybrid ../linuxkit-bios.iso
+/syslinux/isohybrid ../linuxkit-bios.iso
 
 cat ../linuxkit-bios.iso

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 image: mkimage-iso-bios
 arches:
   - amd64
 +  - arm64