diff options
| author | baude <bbaude@redhat.com> | 2018-10-17 16:42:05 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2018-10-17 17:04:19 -0500 |
| commit | bfc473f982ecdbfbe885d104036ecf9f70f3cd0f (patch) | |
| tree | c2c4992606864554b346ebbfa7bddc5061bd3bcc /libpod/container_commit.go | |
| parent | 19c150bef12ff08abc8249cc21275266a7ac74a3 (diff) | |
| download | podman-bfc473f982ecdbfbe885d104036ecf9f70f3cd0f.tar.gz podman-bfc473f982ecdbfbe885d104036ecf9f70f3cd0f.tar.bz2 podman-bfc473f982ecdbfbe885d104036ecf9f70f3cd0f.zip | |
Vendor in new new buildah/ci
libpod requires new buildah and container image versions to resolve
bug #1640298
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/container_commit.go')
| -rw-r--r-- | libpod/container_commit.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 7b6266d97..dabd224d5 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -161,7 +161,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai importBuilder.SetWorkDir(splitChange[1]) } } - candidates, err := 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) } @@ -172,7 +172,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai if err != nil { return nil, errors.Wrapf(err, "error parsing target image name %q", destImage) } - id, err := importBuilder.Commit(ctx, imageRef, commitOptions) + id, _, _, err := importBuilder.Commit(ctx, imageRef, commitOptions) if err != nil { return nil, err } |