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

Merge pull request #171 from ijc/pull-before-run

Browse Source 
Do an explicit docker pull before docker run.
This commit is contained in:
Justin Cormack 2017-10-20 17:26:16 +02:00 committed by GitHub
commit 57c6720356
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/moby/docker.go
View File

@ -22,20 +22,33 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
) )
func dockerRun(input io.Reader, output io.Writer, trust bool, args ...string) error { func dockerRun(input io.Reader, output io.Writer, trust bool, img string, args ...string) 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 {
return errors.New("Docker does not seem to be installed") return errors.New("Docker does not seem to be installed")
} }
args = append([]string{"run", "--network=none", "--rm", "-i"}, args...)
env := os.Environ()
if trust {
env = append(env, "DOCKER_CONTENT_TRUST=1")
}
// Pull first to avoid https://github.com/docker/cli/issues/631
pull := exec.Command(docker, "pull", img)
pull.Env = env
if err := pull.Run(); err != nil {
if exitError, ok := err.(*exec.ExitError); ok {
return fmt.Errorf("docker pull failed: %v output:\n%s", err, exitError.Stderr)
}
return err
}
args = append([]string{"run", "--network=none", "--rm", "-i", img}, args...)
cmd := exec.Command(docker, args...) cmd := exec.Command(docker, args...)
cmd.Stdin = input cmd.Stdin = input
cmd.Stdout = output cmd.Stdout = output
cmd.Env = os.Environ() cmd.Env = env
if trust {
cmd.Env = append(cmd.Env, "DOCKER_CONTENT_TRUST=1")
}
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
if exitError, ok := err.(*exec.ExitError); ok { if exitError, ok := err.(*exec.ExitError); ok {