From 915364034f1ddf036d277830d45c54b8eb39f940 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 23 May 2018 14:15:54 -0400 Subject: Update podman build to match buildah bud functionality Add --label, --annotations, --idfile, --squash Signed-off-by: Daniel J Walsh Closes: #824 Approved by: TomSweeneyRedHat --- vendor/github.com/projectatomic/buildah/commit.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'vendor/github.com/projectatomic/buildah/commit.go') diff --git a/vendor/github.com/projectatomic/buildah/commit.go b/vendor/github.com/projectatomic/buildah/commit.go index da86ee855..75d2626f5 100644 --- a/vendor/github.com/projectatomic/buildah/commit.go +++ b/vendor/github.com/projectatomic/buildah/commit.go @@ -49,6 +49,9 @@ type CommitOptions struct { SystemContext *types.SystemContext // IIDFile tells the builder to write the image ID to the specified file IIDFile string + // Squash tells the builder to produce an image with a single layer + // instead of with possibly more than one layer. + Squash bool } // PushOptions can be used to alter how an image is copied somewhere. @@ -100,7 +103,7 @@ func (b *Builder) Commit(ctx context.Context, dest types.ImageReference, options // Check if we're keeping everything in local storage. If so, we can take certain shortcuts. _, destIsStorage := dest.Transport().(is.StoreTransport) exporting := !destIsStorage - src, err := b.makeImageRef(options.PreferredManifestType, exporting, options.Compression, options.HistoryTimestamp) + src, err := b.makeImageRef(options.PreferredManifestType, exporting, options.Squash, options.Compression, options.HistoryTimestamp) if err != nil { return imgID, errors.Wrapf(err, "error computing layer digests and building metadata") } -- cgit v1.2.3-54-g00ecf