diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-28 09:39:47 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-29 14:27:11 +0000 |
| commit | eb5fdebc84e59f8645218f8fdfd6e6a8136cfa43 (patch) | |
| tree | b1625395d2cb3ca26ba85c3e418ce36edcea27af /pkg | |
| parent | 6a46af571e70fd49655fe97df93391500933b2d1 (diff) | |
| download | podman-eb5fdebc84e59f8645218f8fdfd6e6a8136cfa43.tar.gz podman-eb5fdebc84e59f8645218f8fdfd6e6a8136cfa43.tar.bz2 podman-eb5fdebc84e59f8645218f8fdfd6e6a8136cfa43.zip | |
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 <dwalsh@redhat.com>
Closes: #1364
Approved by: mheon
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/varlinkapi/images.go | 4 |
1 files changed, 2 insertions, 2 deletions
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)) } |