pull: exit with error if the image is not found

Closes: containers#2785 Signed-off-by: Giuseppe Scrivano <[email protected]>
giuseppe · Apr 12, 2019 · fcea6fd · fcea6fd
1 parent 6f3d2ed
commit fcea6fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go
@@ -62,6 +62,11 @@ func init() {
 // pullCmd gets the data from the command line and calls pullImage
 // to copy an image from a registry to a local machine
 func pullCmd(c *cliconfig.PullValues) (retError error) {
+	defer func() {
+		if retError != nil && exitCode == 0 {
+			exitCode = 1
+		}
+	}()
 	if c.Bool("trace") {
 		span, _ := opentracing.StartSpanFromContext(Ctx, "pullCmd")
 		defer span.Finish()

diff --git a/test/e2e/pull_test.go b/test/e2e/pull_test.go
@@ -38,6 +38,12 @@ var _ = Describe("Podman pull", func() {
 
 	})
 
+	It("podman pull from docker a not existing image", func() {
+		session := podmanTest.Podman([]string{"pull", "ibetthisdoesntexistthere:foo"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Not(Equal(0)))
+	})
+
 	It("podman pull from docker with tag", func() {
 		session := podmanTest.Podman([]string{"pull", "busybox:glibc"})
 		session.WaitWithDefaultTimeout()