diff --git a/base/guestfs/Dockerfile b/base/guestfs/Dockerfile index e31bbaa14..9592aba2f 100644 --- a/base/guestfs/Dockerfile +++ b/base/guestfs/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:jessie +FROM debian:stretch ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get -yq upgrade && apt-get install -yq libguestfs-tools syslinux linux-image-amd64 vim diff --git a/output.go b/output.go index 95f4cdb8c..41b1696d5 100644 --- a/output.go +++ b/output.go @@ -11,6 +11,8 @@ import ( const ( bios = "mobylinux/mkimage-iso-bios:489b1f054a77a8f379d0bfc6cd91639b4db6b67c@sha256:0f058951aac4367d132682aa19eeb5cdcb05600a5d51fe5d0fcbd97b03ae4f87" efi = "mobylinux/mkimage-iso-efi:b210c58e096e53082d35b28fa2b52dba6ae200c8@sha256:10c2789bf5fbd27c35c5fe2f3b97f75a7108bbde389d0f5ed750e3e2dae95376" + gce = "mobylinux/mkimage-gce:2039be4e39e855d1845aee188e266bba3f1d2eed@sha256:e12f76003fd9eaa0c6f39f149db5998cf56de42539b989c994893c8344ca69c0" + vhd = "mobylinux/mkimage-vhd:73c80e433bf717578c507621a84fd58cec27fe95@sha256:0ae1eda2d6592f309977dc4b25cca120cc4e2ee2cc786e88fdc2761c0d49cb14" ) func outputs(m *Moby, base string, bzimage []byte, initrd []byte) error { @@ -31,6 +33,16 @@ func outputs(m *Moby, base string, bzimage []byte, initrd []byte) error { if err != nil { return fmt.Errorf("Error writing %s output: %v", o.Format, err) } + case "gce-img": + err := outputImg(gce, base+".img.tar.gz", bzimage, initrd, m.Kernel.Cmdline) + if err != nil { + return fmt.Errorf("Error writing %s output: %v", o.Format, err) + } + case "vhd": + err := outputImg(vhd, base+".vhd", bzimage, initrd, m.Kernel.Cmdline) + if err != nil { + return fmt.Errorf("Error writing %s output: %v", o.Format, err) + } case "": return fmt.Errorf("No format specified for output") default: @@ -40,9 +52,7 @@ func outputs(m *Moby, base string, bzimage []byte, initrd []byte) error { return nil } -// TODO add kernel command line -func outputISO(image, filename string, bzimage []byte, initrd []byte, args ...string) error { - // first build the input tarball from kernel and initrd +func tarInitrdKernel(bzimage, initrd []byte) (*bytes.Buffer, error) { buf := new(bytes.Buffer) tw := tar.NewWriter(buf) hdr := &tar.Header{ @@ -52,11 +62,11 @@ func outputISO(image, filename string, bzimage []byte, initrd []byte, args ...st } err := tw.WriteHeader(hdr) if err != nil { - return err + return buf, err } _, err = tw.Write(bzimage) if err != nil { - return err + return buf, err } hdr = &tar.Header{ Name: "initrd.img", @@ -65,13 +75,38 @@ func outputISO(image, filename string, bzimage []byte, initrd []byte, args ...st } err = tw.WriteHeader(hdr) if err != nil { - return err + return buf, err } _, err = tw.Write(initrd) if err != nil { - return err + return buf, err } err = tw.Close() + if err != nil { + return buf, err + } + return buf, nil +} + +func outputImg(image, filename string, bzimage []byte, initrd []byte, args ...string) error { + buf, err := tarInitrdKernel(bzimage, initrd) + if err != nil { + return err + } + img, err := dockerRunInput(buf, append([]string{image}, args...)...) + if err != nil { + return err + } + err = ioutil.WriteFile(filename, img, os.FileMode(0644)) + if err != nil { + return err + } + fmt.Println(filename) + return nil +} + +func outputISO(image, filename string, bzimage []byte, initrd []byte, args ...string) error { + buf, err := tarInitrdKernel(bzimage, initrd) if err != nil { return err } diff --git a/tools/mkimage-gce/Dockerfile b/tools/mkimage-gce/Dockerfile index e3b266ee1..5ec767ee5 100644 --- a/tools/mkimage-gce/Dockerfile +++ b/tools/mkimage-gce/Dockerfile @@ -1,5 +1,5 @@ -FROM mobylinux/guestfs:8719f0f33b3cf9d59a62be64a42220978ac96486@sha256:c7229f01c1a54270d2bc3597c30121628c18db211ed32fb7202823b6eaa4f853 +FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372ada5b3db64a11bc8c60eec06659a1052d9296fa0c556ed3faf75c182 COPY . . -CMD [ "/make-gce" ] +ENTRYPOINT [ "/make-gce" ] diff --git a/tools/mkimage-gce/Makefile b/tools/mkimage-gce/Makefile index 855bbdb34..934cb1808 100644 --- a/tools/mkimage-gce/Makefile +++ b/tools/mkimage-gce/Makefile @@ -6,7 +6,7 @@ default: push hash: Dockerfile make-gce tar cf - $^ | docker build --no-cache -t $(IMAGE):build - - docker run --rm $(IMAGE):build sh -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash + docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash push: hash docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ diff --git a/tools/mkimage-gce/make-gce b/tools/mkimage-gce/make-gce index 09795e501..ef811b2e8 100755 --- a/tools/mkimage-gce/make-gce +++ b/tools/mkimage-gce/make-gce @@ -18,6 +18,7 @@ cd files INITRD="$(find . -name '*.img')" KERNEL="$(find . -name vmlinuz64 -or -name bzImage)" +CMDLINE="$*" [ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64 [ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img @@ -32,7 +33,7 @@ CFG="DEFAULT linux LABEL linux KERNEL /vmlinuz64 INITRD /initrd.img - APPEND $GCE_CONFIG $* + APPEND ${CMDLINE} " printf "$CFG" > syslinux.cfg diff --git a/tools/mkimage-vhd/Dockerfile b/tools/mkimage-vhd/Dockerfile new file mode 100644 index 000000000..21080d983 --- /dev/null +++ b/tools/mkimage-vhd/Dockerfile @@ -0,0 +1,5 @@ +FROM mobylinux/guestfs:69698aca5bfcb8c4d3a3bbe6d8656be155bf8cd6@sha256:703a7372ada5b3db64a11bc8c60eec06659a1052d9296fa0c556ed3faf75c182 + +COPY . . + +ENTRYPOINT [ "/make-vhd" ] diff --git a/tools/mkimage-vhd/Makefile b/tools/mkimage-vhd/Makefile new file mode 100644 index 000000000..5107b33e8 --- /dev/null +++ b/tools/mkimage-vhd/Makefile @@ -0,0 +1,27 @@ +.PHONY: tag push + +IMAGE=mkimage-vhd + +default: push + +hash: Dockerfile make-vhd + tar cf - $^ | docker build --no-cache -t $(IMAGE):build - + docker run --entrypoint sh --rm $(IMAGE):build -c "(cat $^; apt list --installed 2>/dev/null) | sha1sum" | sed 's/ .*//' > hash + +push: hash + docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ + (docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \ + docker push mobylinux/$(IMAGE):$(shell cat hash)) + docker rmi $(IMAGE):build + rm -f hash + +tag: hash + docker pull mobylinux/$(IMAGE):$(shell cat hash) || \ + docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) + docker rmi $(IMAGE):build + rm -f hash + +clean: + rm -f hash + +.DELETE_ON_ERROR: diff --git a/tools/mkimage-vhd/make-vhd b/tools/mkimage-vhd/make-vhd new file mode 100755 index 000000000..4db38021e --- /dev/null +++ b/tools/mkimage-vhd/make-vhd @@ -0,0 +1,55 @@ +#!/bin/sh + +set -e + +mkdir -p /tmp/image +cd /tmp/image + +# input is a tarball of vmlinuz64 and initrd.img on stdin +# output is a vhd on stdout + +mkdir -p files + +cd files + +# extract. As guestfs base is currently Debian, no compression support +# only if stdin is a tty, if so need files volume mounted... +[ -t 0 ] || tar xf - + +INITRD="$(find . -name '*.img')" +KERNEL="$(find . -name vmlinuz64 -or -name '*bzImage')" +CMDLINE="$*" + +[ "$KERNEL" = "./vmlinuz64" ] || mv "$KERNEL" vmlinuz64 +[ "$INITRD" = "./initrd.img" ] || mv "$INITRD" initrd.img + +# clean up subdirectories +find . -mindepth 1 -maxdepth 1 -type d | xargs rm -rf + +CFG="DEFAULT linux +LABEL linux + KERNEL /vmlinuz64 + INITRD /initrd.img + APPEND ${CMDLINE} +" + +printf "$CFG" > syslinux.cfg + +cd .. + +tar cf files.tar -C files . + +# no direct vhd support +virt-make-fs --size=1G --type=ext4 --partition files.tar disk.img + +guestfish -a disk.img -m /dev/sda1 <&2 + +cat disk.vhd