github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72 from justincormack/rename-images

Browse Source 
Rename img→raw and gcp-img→gcp
This commit is contained in:
Justin Cormack 2017-06-07 16:38:29 +01:00 committed by GitHub
commit 68ffbb5e7e
1 changed files with 4 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
cmd/moby/output.go
View File

@ -3,12 +3,9 @@ package main
import ( import (
"archive/tar" "archive/tar"
"bytes" "bytes"
"compress/gzip"
"fmt" "fmt"
"io"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath"
log "github.com/Sirupsen/logrus" log "github.com/Sirupsen/logrus"
"github.com/linuxkit/linuxkit/src/initrd" "github.com/linuxkit/linuxkit/src/initrd"
@ -56,7 +53,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
} }
return nil 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" filename := base + ".img"
log.Infof(" %s", filename) log.Infof(" %s", filename)
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
@ -69,47 +66,7 @@ var outFuns = map[string]func(string, []byte, int, bool) error{
} }
return nil return nil
}, },
"img-gz": func(base string, image []byte, size int, hyperkit bool) error { "gcp": 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 {
kernel, initrd, cmdline, err := tarToInitrd(image) kernel, initrd, cmdline, err := tarToInitrd(image)
if err != nil { if err != nil {
return fmt.Errorf("Error converting to initrd: %v", err) 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{ var prereq = map[string]string{
"img": "mkimage", "raw": "mkimage",
"img-gz": "mkimage", "qcow2": "mkimage",
"gcp-img": "mkimage",
"qcow2": "mkimage",
} }
func ensurePrereq(out string) error { func ensurePrereq(out string) error {