From eabe03b70273fb4dbfff64e0cf7f3532a697b1aa Mon Sep 17 00:00:00 2001
From: Justin Cormack <justin.cormack@docker.com>
Date: Wed, 7 Jun 2017 14:32:12 +0100
Subject: [PATCH] =?UTF-8?q?Rename=20img=E2=86=92raw=20and=20gcp-img?=
 =?UTF-8?q?=E2=86=92gcp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- generally people refer to a plain disk image as `raw`
- `gcp` is shorter and it is the only image type supported
- remove `img-gz` as it is not needed. It does not really save space
  as you have to build the full image and compress it anyway. On
  many platforms the `raw` image will be a sparse file anyway,
  even on the Mac soon.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
---
 cmd/moby/output.go | 53 ++++------------------------------------------
 1 file changed, 4 insertions(+), 49 deletions(-)

diff --git a/cmd/moby/output.go b/cmd/moby/output.go
index 9a0c7358c..e5901f7a4 100644
--- a/cmd/moby/output.go
+++ b/cmd/moby/output.go
@@ -3,12 +3,9 @@ package main
 import (
 	"archive/tar"
 	"bytes"
-	"compress/gzip"
 	"fmt"
-	"io"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 
 	log "github.com/Sirupsen/logrus"
 	"github.com/linuxkit/linuxkit/src/initrd"
@@ -56,7 +53,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
 		}
 		return nil
 	},
-	"img": func(base string, image []byte, size int, hyperkit bool) error {
+	"raw": func(base string, image []byte, size int, hyperkit bool) error {
 		filename := base + ".img"
 		log.Infof("  %s", filename)
 		kernel, initrd, cmdline, err := tarToInitrd(image)
@@ -69,47 +66,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
 		}
 		return nil
 	},
-	"img-gz": func(base string, image []byte, size int, hyperkit bool) error {
-		filename := base + ".img.gz"
-		log.Infof("  %s", filename)
-		kernel, initrd, cmdline, err := tarToInitrd(image)
-		if err != nil {
-			return fmt.Errorf("Error converting to initrd: %v", err)
-		}
-		tmp, err := ioutil.TempDir(filepath.Join(MobyDir, "tmp"), "img-gz")
-		if err != nil {
-			return err
-		}
-		defer os.RemoveAll(tmp)
-		err = outputLinuxKit("raw", filepath.Join(tmp, "uncompressed.img"), kernel, initrd, cmdline, size, hyperkit)
-		if err != nil {
-			return fmt.Errorf("Error writing img-gz output: %v", err)
-		}
-		out, err := os.Create(filename)
-		if err != nil {
-			return err
-		}
-		in, err := os.Open(filepath.Join(tmp, "uncompressed.img"))
-		if err != nil {
-			return err
-		}
-		zw := gzip.NewWriter(out)
-		io.Copy(zw, in)
-		err = zw.Close()
-		if err != nil {
-			return err
-		}
-		err = in.Close()
-		if err != nil {
-			return err
-		}
-		err = out.Close()
-		if err != nil {
-			return err
-		}
-		return nil
-	},
-	"gcp-img": func(base string, image []byte, size int, hyperkit bool) error {
+	"gcp": func(base string, image []byte, size int, hyperkit bool) error {
 		kernel, initrd, cmdline, err := tarToInitrd(image)
 		if err != nil {
 			return fmt.Errorf("Error converting to initrd: %v", err)
@@ -158,10 +115,8 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
 }
 
 var prereq = map[string]string{
-	"img":     "mkimage",
-	"img-gz":  "mkimage",
-	"gcp-img": "mkimage",
-	"qcow2":   "mkimage",
+	"raw":   "mkimage",
+	"qcow2": "mkimage",
 }
 
 func ensurePrereq(out string) error {