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 /vendor/github.com/projectatomic/buildah/imagebuildah | |
| 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 'vendor/github.com/projectatomic/buildah/imagebuildah')
| -rw-r--r-- | vendor/github.com/projectatomic/buildah/imagebuildah/build.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go index 52bbe9d8c..08d0f6268 100644 --- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go +++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go @@ -34,11 +34,9 @@ import ( ) const ( - PullIfMissing = buildah.PullIfMissing - PullAlways = buildah.PullAlways - PullNever = buildah.PullNever - OCIv1ImageFormat = buildah.OCIv1ImageManifest - Dockerv2ImageFormat = buildah.Dockerv2ImageManifest + PullIfMissing = buildah.PullIfMissing + PullAlways = buildah.PullAlways + PullNever = buildah.PullNever Gzip = archive.Gzip Bzip2 = archive.Bzip2 @@ -114,7 +112,7 @@ type BuildOptions struct { ReportWriter io.Writer // OutputFormat is the format of the output image's manifest and // configuration data. - // Accepted values are OCIv1ImageFormat and Dockerv2ImageFormat. + // Accepted values are buildah.OCIv1ImageManifest and buildah.Dockerv2ImageManifest. OutputFormat string // SystemContext holds parameters used for authentication. SystemContext *types.SystemContext @@ -640,6 +638,7 @@ func (b *Executor) Prepare(ctx context.Context, ib *imagebuilder.Builder, node * IDMappingOptions: b.idmappingOptions, CommonBuildOpts: b.commonBuildOptions, DefaultMountsFilePath: b.defaultMountsFilePath, + Format: b.outputFormat, } builder, err := buildah.NewBuilder(ctx, b.store, builderOptions) if err != nil { |