diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-12 14:26:39 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2019-04-12 15:24:22 +0200 |
| commit | fcea6fda82cc3809f8990c0c80a52f6c4a03c5cd (patch) | |
| tree | fb74ed3bb903d97cc180fb3036b6b5dbf571a69e | |
| parent | 6f3d2edc2beb8d18452cdd7b3b1ef7f05b90f5c5 (diff) | |
| download | podman-fcea6fda82cc3809f8990c0c80a52f6c4a03c5cd.tar.gz podman-fcea6fda82cc3809f8990c0c80a52f6c4a03c5cd.tar.bz2 podman-fcea6fda82cc3809f8990c0c80a52f6c4a03c5cd.zip | |
pull: exit with error if the image is not found
Closes: https://github.com/containers/libpod/issues/2785
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | cmd/podman/pull.go | 5 | ||||
| -rw-r--r-- | test/e2e/pull_test.go | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cmd/podman/pull.go b/cmd/podman/pull.go index aa000fc52..7cc7b65b3 100644 --- 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 index de6d4ea09..4e4e80d56 100644 --- 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() |