Merge pull request kubernetes#85478 from bart0sh/PR0084-e2e_node-inspect-inspect-image-before-pulling

k8s-ci-robot · web-flow · commit 0e072a8214e4 · 2020-04-20T14:05:40.000-07:00
e2e_node: check if image exists locally before pulling
diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go
@@ -98,7 +98,11 @@ func (dp *dockerPuller) Name() string {
 }
 
 func (dp *dockerPuller) Pull(image string) ([]byte, error) {
-	return exec.Command("docker", "pull", image).CombinedOutput()
+	// TODO(random-liu): Use docker client to get rid of docker binary dependency.
+	if exec.Command("docker", "inspect", "--type=image", image).Run() != nil {
+		return exec.Command("docker", "pull", image).CombinedOutput()
+	}
+	return nil, nil
 }
 
 type remotePuller struct {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,11 @@ func (dp *dockerPuller) Name() string {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`func (dp *dockerPuller) Pull(image string) ([]byte, error) {`
`101`		`- return exec.Command("docker", "pull", image).CombinedOutput()`
	`101`	`+ // TODO(random-liu): Use docker client to get rid of docker binary dependency.`
	`102`	`+ if exec.Command("docker", "inspect", "--type=image", image).Run() != nil {`
	`103`	`+ return exec.Command("docker", "pull", image).CombinedOutput()`
	`104`	`+ }`
	`105`	`+ return nil, nil`
`102`	`106`	`}`
`103`	`107`
`104`	`108`	`type remotePuller struct {`