diff options
author | umohnani8 <umohnani@redhat.com> | 2018-05-01 13:25:30 -0400 |
---|---|---|
committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-05-01 20:23:45 +0000 |
commit | e98ad5751d12b6ef052803b30fd397101952294e (patch) | |
tree | 9e6c0ab61205f1e26c417f5ebfdb393268f94c6a /vendor/github.com/projectatomic/buildah/imagebuildah | |
parent | 7a0a8552cb4af7af6fc6fb458fd41776f57f543c (diff) | |
download | podman-e98ad5751d12b6ef052803b30fd397101952294e.tar.gz podman-e98ad5751d12b6ef052803b30fd397101952294e.tar.bz2 podman-e98ad5751d12b6ef052803b30fd397101952294e.zip |
Vendor in latest buildah
Adds in --iidfile flag to podman build.
Signed-off-by: umohnani8 <umohnani@redhat.com>
Closes: #707
Approved by: mheon
Diffstat (limited to 'vendor/github.com/projectatomic/buildah/imagebuildah')
-rw-r--r-- | vendor/github.com/projectatomic/buildah/imagebuildah/build.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go index c477e0996..81e8108a0 100644 --- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go +++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go @@ -110,6 +110,8 @@ type BuildOptions struct { CommonBuildOpts *buildah.CommonBuildOptions // DefaultMountsFilePath is the file path holding the mounts to be mounted in "host-path:container-path" format DefaultMountsFilePath string + // IIDFile tells the builder to write the image ID to the specified file + IIDFile string } // Executor is a buildah-based implementation of the imagebuilder.Executor @@ -146,6 +148,7 @@ type Executor struct { reportWriter io.Writer commonBuildOptions *buildah.CommonBuildOptions defaultMountsFilePath string + iidfile string } // withName creates a new child executor that will be used whenever a COPY statement uses --from=NAME. @@ -477,6 +480,7 @@ func NewExecutor(store storage.Store, options BuildOptions) (*Executor, error) { reportWriter: options.ReportWriter, commonBuildOptions: options.CommonBuildOpts, defaultMountsFilePath: options.DefaultMountsFilePath, + iidfile: options.IIDFile, } if exec.err == nil { exec.err = os.Stderr @@ -683,6 +687,7 @@ func (b *Executor) Commit(ctx context.Context, ib *imagebuilder.Builder) (err er AdditionalTags: b.additionalTags, ReportWriter: b.reportWriter, PreferredManifestType: b.outputFormat, + IIDFile: b.iidfile, } return b.builder.Commit(ctx, imageRef, options) } |