github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90 from justincormack/dockerinput

Browse Source 
Rename the docker run function
This commit is contained in:
Justin Cormack 2017-06-21 11:17:07 -07:00 committed by GitHub
commit a7e3fd29b4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/moby/docker.go
View File

@ -21,7 +21,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
) )
func dockerRunInput(input io.Reader, args ...string) ([]byte, error) { func dockerRun(input io.Reader, args ...string) ([]byte, error) {
log.Debugf("docker run (input): %s", strings.Join(args, " ")) log.Debugf("docker run (input): %s", strings.Join(args, " "))
docker, err := exec.LookPath("docker") docker, err := exec.LookPath("docker")
if err != nil { if err != nil {

6
cmd/moby/output.go
View File

@ -232,7 +232,7 @@ func outputImg(image, filename string, kernel []byte, initrd []byte, cmdline str
if err != nil { if err != nil {
return err return err
} }
img, err := dockerRunInput(buf, image, cmdline) img, err := dockerRun(buf, image, cmdline)
if err != nil { if err != nil {
return err return err
} }
@ -253,9 +253,9 @@ func outputImgSize(image, filename string, kernel []byte, initrd []byte, cmdline
} }
var img []byte var img []byte
if size == 0 { if size == 0 {
img, err = dockerRunInput(buf, image) img, err = dockerRun(buf, image)
} else { } else {
img, err = dockerRunInput(buf, image, fmt.Sprintf("%dM", size)) img, err = dockerRun(buf, image, fmt.Sprintf("%dM", size))
} }
if err != nil { if err != nil {
return err return err