From bfc473f982ecdbfbe885d104036ecf9f70f3cd0f Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 17 Oct 2018 16:42:05 -0500 Subject: Vendor in new new buildah/ci libpod requires new buildah and container image versions to resolve bug #1640298 Signed-off-by: baude --- libpod/container_commit.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libpod/container_commit.go') 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 } -- cgit v1.2.3-54-g00ecf