From eb5fdebc84e59f8645218f8fdfd6e6a8136cfa43 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Tue, 28 Aug 2018 09:39:47 -0400 Subject: Vendor in latest projectatomic/buildah This will help document the defaults in podman build. podman build --help will now show the defaults and mention the environment variables that can be set to change them. Signed-off-by: Daniel J Walsh Closes: #1364 Approved by: mheon --- pkg/varlinkapi/images.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/varlinkapi') diff --git a/pkg/varlinkapi/images.go b/pkg/varlinkapi/images.go index 174225953..3cd2b879a 100644 --- a/pkg/varlinkapi/images.go +++ b/pkg/varlinkapi/images.go @@ -133,9 +133,9 @@ func (i *LibpodAPI) BuildImage(call iopodman.VarlinkCall, config iopodman.BuildI } if strings.HasPrefix(manifestType, "oci") { - manifestType = imagebuildah.OCIv1ImageFormat + manifestType = buildah.OCIv1ImageManifest } else if strings.HasPrefix(manifestType, "docker") { - manifestType = imagebuildah.Dockerv2ImageFormat + manifestType = buildah.Dockerv2ImageManifest } else { return call.ReplyErrorOccurred(fmt.Sprintf("unrecognized image type %q", manifestType)) } -- cgit v1.2.3-54-g00ecf