diff options
| author | umohnani8 <umohnani@redhat.com> | 2018-08-23 14:44:38 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 19:11:09 +0000 |
| commit | 16465007d0ea1226b63efccc98f1adc8dc279fd3 (patch) | |
| tree | 3d902d4406008f9fa9cebc871ce256a95763b09d /libpod | |
| parent | 4c00dc66dfacc214d6fff845b73a4fc4226b6747 (diff) | |
| download | podman-16465007d0ea1226b63efccc98f1adc8dc279fd3.tar.gz podman-16465007d0ea1226b63efccc98f1adc8dc279fd3.tar.bz2 podman-16465007d0ea1226b63efccc98f1adc8dc279fd3.zip | |
Vendor in latest projectatomic/buildah
Fixes to podman build for unknown image and ADD with url
when doing --layers.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #1330
Approved by: mheon
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_commit.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libpod/container_commit.go b/libpod/container_commit.go index de659c982..93ad4006e 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -161,7 +161,10 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai importBuilder.SetWorkDir(splitChange[1]) } } - candidates := util.ResolveName(destImage, "", sc, c.runtime.store) + candidates, err := util.ResolveName(destImage, "", sc, c.runtime.store) + if err != nil { + return nil, errors.Wrapf(err, "error resolving name %q", destImage) + } if len(candidates) == 0 { return nil, errors.Errorf("error parsing target image name %q", destImage) } |