From 3b46f9fcbef9a2071e9369f48e212e4d139ae357 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 5 Sep 2016 23:58:12 +0100 Subject: [PATCH 1/2] Use alpine to build bios Signed-off-by: Justin Cormack --- alpine/Dockerfile.bios | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/alpine/Dockerfile.bios b/alpine/Dockerfile.bios index c8f10fea1..5ab3087cb 100644 --- a/alpine/Dockerfile.bios +++ b/alpine/Dockerfile.bios @@ -1,21 +1,16 @@ # Create a legacy BIOS bootable ISO -FROM ubuntu:16.04 +FROM alpine:3.4 -ENV ARCH=x86_64 - -RUN apt-get update && apt-get -y upgrade && apt-get -y install \ - genisoimage \ - xorriso \ - syslinux \ - syslinux-utils \ - isolinux +RUN apk update && apk add \ + cdrkit \ + syslinux RUN mkdir -p /tmp/iso/isolinux && \ - cp /usr/lib/ISOLINUX/isolinux.bin /tmp/iso/isolinux && \ - cp usr/lib/syslinux/modules/bios/ldlinux.c32 /tmp/iso/isolinux + cp /usr/share/syslinux/isolinux.bin /tmp/iso/isolinux && \ + cp /usr/share/syslinux/ldlinux.c32 /tmp/iso/isolinux COPY initrd.img /tmp/iso -COPY kernel/$ARCH/vmlinuz64 /tmp/iso +COPY kernel/x86_64/vmlinuz64 /tmp/iso COPY isolinux.cfg /tmp/iso/isolinux RUN cd /tmp/iso && \ From feb141d3247206e5e0f87556ede89282b12102f6 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Tue, 6 Sep 2016 00:11:48 +0100 Subject: [PATCH 2/2] fix iso build Signed-off-by: Justin Cormack --- Dockerfile.qemuiso | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.qemuiso b/Dockerfile.qemuiso index 3997e80a5..8ff221216 100644 --- a/Dockerfile.qemuiso +++ b/Dockerfile.qemuiso @@ -1,5 +1,5 @@ FROM justincormack/alpine-qemu -COPY alpine/mobylinux.iso . +COPY alpine/mobylinux-bios.iso . -ENTRYPOINT [ "qemu-system-x86_64", "-serial", "stdio", "-cdrom", "./mobylinux.iso", "-m", "1G", "-vnc", "none" ] +ENTRYPOINT [ "qemu-system-x86_64", "-serial", "stdio", "-cdrom", "./mobylinux-bios.iso", "-m", "2048", "-vnc", "none" ] diff --git a/Makefile b/Makefile index 84dcb7779..c35549b2f 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ qemu: all docker run -it --rm mobyqemu:build qemu-iso: all - $(MAKE) -C alpine mobylinux.iso + $(MAKE) -C alpine mobylinux-bios.iso docker build -f Dockerfile.qemuiso -t mobyqemuiso:build . docker run -it --rm mobyqemuiso:build