From 1274f81f819cd93b42a74b1651958e70ed4004d7 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Fri, 12 May 2017 14:29:14 +0100 Subject: [PATCH] Add a compressed disk image format This is a fairly generic bootable disk with syslinux. Should work if you dd it onto a USB stick, and should also work for AWS. You need to uncompress it of course! Default size is 1G. Will add cli option to set the size once I split out `moby build` and `moby package` shortly. Signed-off-by: Justin Cormack --- cmd/moby/output.go | 51 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 11 deletions(-) diff --git a/cmd/moby/output.go b/cmd/moby/output.go index 918987f56..0cf47a97d 100644 --- a/cmd/moby/output.go +++ b/cmd/moby/output.go @@ -15,6 +15,7 @@ const ( bios = "linuxkit/mkimage-iso-bios:db791abed6f2b5320feb6cec255a635aee3756f6@sha256:e57483075307bcea4a7257f87eee733d3e24e7a964ba15dcc01111df6729ab3b" efi = "linuxkit/mkimage-iso-efi:5c2fc616bde288476a14f4f6dd0d273a66832822@sha256:876ef47ec2b30af40e70f1e98f496206eb430915867c4f9f400e1af47fd58d7c" gcp = "linuxkit/mkimage-gcp:46716b3d3f7aa1a7607a3426fe0ccebc554b14ee@sha256:18d8e0482f65a2481f5b6ba1e7ce77723b246bf13bdb612be5e64df90297940c" + img = "linuxkit/mkimage-img-gz:eb85aac97f716ad8b8e7e593de3378e740ef2eeb@sha256:f1fb2368765a8ba6d1edfb073565550ae98486fb4943fbeb7d05357e5ba9969d" qcow = "linuxkit/mkimage-qcow:69890f35b55e4ff8a2c7a714907f988e57056d02@sha256:f89dc09f82bdbf86d7edae89604544f20b99d99c9b5cabcf1f93308095d8c244" vhd = "linuxkit/mkimage-vhd:a04c8480d41ca9cef6b7710bd45a592220c3acb2@sha256:ba373dc8ae5dc72685dbe4b872d8f588bc68b2114abd8bdc6a74d82a2b62cce3" vmdk = "linuxkit/mkimage-vmdk:182b541474ca7965c8e8f987389b651859f760da@sha256:99638c5ddb17614f54c6b8e11bd9d49d1dea9d837f38e0f6c1a5f451085d449b" @@ -44,7 +45,7 @@ func outputs(m *Moby, base string, image []byte) error { if err != nil { return fmt.Errorf("Error converting to initrd: %v", err) } - err = outputISO(bios, base+".iso", kernel, initrd, cmdline) + err = outputImg(bios, base+".iso", kernel, initrd, cmdline) if err != nil { return fmt.Errorf("Error writing %s output: %v", o.Format, err) } @@ -53,7 +54,16 @@ func outputs(m *Moby, base string, image []byte) error { if err != nil { return fmt.Errorf("Error converting to initrd: %v", err) } - err = outputISO(efi, base+"-efi.iso", kernel, initrd, cmdline) + err = outputImg(efi, base+"-efi.iso", kernel, initrd, cmdline) + if err != nil { + return fmt.Errorf("Error writing %s output: %v", o.Format, err) + } + case "img-gz": + kernel, initrd, cmdline, err := tarToInitrd(image) + if err != nil { + return fmt.Errorf("Error converting to initrd: %v", err) + } + err = outputImgSize(img, base+".img.gz", kernel, initrd, cmdline, "1G") if err != nil { return fmt.Errorf("Error writing %s output: %v", o.Format, err) } @@ -115,7 +125,7 @@ func tarToInitrd(image []byte) ([]byte, []byte, string, error) { return kernel, w.Bytes(), cmdline, nil } -func tarInitrdKernel(kernel, initrd []byte) (*bytes.Buffer, error) { +func tarInitrdKernel(kernel, initrd []byte, cmdline string) (*bytes.Buffer, error) { buf := new(bytes.Buffer) tw := tar.NewWriter(buf) hdr := &tar.Header{ @@ -144,6 +154,19 @@ func tarInitrdKernel(kernel, initrd []byte) (*bytes.Buffer, error) { if err != nil { return buf, err } + hdr = &tar.Header{ + Name: "cmdline", + Mode: 0600, + Size: int64(len(cmdline)), + } + err = tw.WriteHeader(hdr) + if err != nil { + return buf, err + } + _, err = tw.Write([]byte(cmdline)) + if err != nil { + return buf, err + } err = tw.Close() if err != nil { return buf, err @@ -151,14 +174,14 @@ func tarInitrdKernel(kernel, initrd []byte) (*bytes.Buffer, error) { return buf, nil } -func outputImg(image, filename string, kernel []byte, initrd []byte, args ...string) error { +func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline string) error { log.Debugf("output img: %s %s", image, filename) log.Infof(" %s", filename) - buf, err := tarInitrdKernel(kernel, initrd) + buf, err := tarInitrdKernel(kernel, initrd, cmdline) if err != nil { return err } - img, err := dockerRunInput(buf, append([]string{image}, args...)...) + img, err := dockerRunInput(buf, image, cmdline) if err != nil { return err } @@ -169,18 +192,24 @@ func outputImg(image, filename string, kernel []byte, initrd []byte, args ...str return nil } -func outputISO(image, filename string, kernel []byte, initrd []byte, args ...string) error { - log.Debugf("output iso: %s %s", image, filename) +// this should replace the other version for types that can specify a size, and get size from CLI in future +func outputImgSize(image, filename string, kernel []byte, initrd []byte, cmdline string, size string) error { + log.Debugf("output img: %s %s size %s", image, filename, size) log.Infof(" %s", filename) - buf, err := tarInitrdKernel(kernel, initrd) + buf, err := tarInitrdKernel(kernel, initrd, cmdline) if err != nil { return err } - iso, err := dockerRunInput(buf, append([]string{image}, args...)...) + var img []byte + if size == "" { + img, err = dockerRunInput(buf, image) + } else { + img, err = dockerRunInput(buf, image, size) + } if err != nil { return err } - err = ioutil.WriteFile(filename, iso, os.FileMode(0644)) + err = ioutil.WriteFile(filename, img, os.FileMode(0644)) if err != nil { return err }