Merge pull request #183 from beringresearch/img-compress

compress disk image on publish

cmd/import.go

@@ -93,6 +93,13 @@ func importMachine(cmd *cobra.Command, args []string) {
 		os.RemoveAll(tempArchive)
 		log.Fatal("unable to import: " + err.Error())
 	}
+
+	err = machineConfig.DecompressQemuDiskImage()
+	if err != nil {
+		os.RemoveAll(targetDir)
+		os.RemoveAll(tempArchive)
+		log.Fatal("unable to import: " + err.Error())
+	}
 }
 
 func decryptArchive(archive string) error {

cmd/publish.go

@@ -87,6 +87,12 @@ func publish(cmd *cobra.Command, args []string) {
 			continue
 		}
 
+		err = machineConfig.CompressQemuDiskImage()
+		if err != nil {
+			errs[i] = utils.CmdResult{Name: vmName, Err: err}
+			continue
+		}
+
 		files := []string{}
 		for _, f := range fileInfo {
 			if !utils.StringSliceContains([]string{"alpine.qmp", "alpine.sock", "alpine.pid"}, f.Name()) {

qemu/ops.go

@@ -687,6 +687,62 @@ func (c *MachineConfig) Launch() error {
 	return nil
 }
 
+// CompressQemuDiskImage compresses the QEMU Disk image and overwrites it
+func (c *MachineConfig) CompressQemuDiskImage() error {
+	if !utils.CommandExists("qemu-img") {
+		return errors.New("qemu-img is not available on $PATH. ensure qemu is installed")
+	}
+
+	cmd := exec.Command("qemu-img", "convert", "-c", "-O", "qcow2", filepath.Join(c.Location, c.Image),
+		filepath.Join(c.Location, c.Image+"_compressed.qcow2"))
+
+	err := cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	err = os.Remove(filepath.Join(c.Location, c.Image))
+	if err != nil {
+		return err
+	}
+
+	err = os.Rename(filepath.Join(c.Location, c.Image+"_compressed.qcow2"),
+		filepath.Join(c.Location, c.Image))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// DecompressQemuDiskImage decompresses the QEMU Disk image and overwrites it
+func (c *MachineConfig) DecompressQemuDiskImage() error {
+	if !utils.CommandExists("qemu-img") {
+		return errors.New("qemu-img is not available on $PATH. ensure qemu is installed")
+	}
+
+	cmd := exec.Command("qemu-img", "convert", "-O", "qcow2", "-p", filepath.Join(c.Location, c.Image),
+		filepath.Join(c.Location, c.Image+"_decompressed.qcow2"))
+
+	err := cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	err = os.Remove(filepath.Join(c.Location, c.Image))
+	if err != nil {
+		return err
+	}
+
+	err = os.Rename(filepath.Join(c.Location, c.Image+"_decompressed.qcow2"),
+		filepath.Join(c.Location, c.Image))
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // ResizeQemuDiskImage resizes a qcow2 disk image
 func (c *MachineConfig) ResizeQemuDiskImage() error {
 	if !utils.CommandExists("qemu-img") {