From 57e1600315c3b4657797d2605cc69d7343da034f Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 16 Aug 2018 16:23:09 -0400 Subject: Vendor in latest buildah and imagebuilder We want to add the latest support for COPY --chown UID:GID. Signed-off-by: Daniel J Walsh Closes: #1289 Approved by: TomSweeneyRedHat --- vendor/github.com/projectatomic/buildah/imagebuildah/build.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'vendor/github.com/projectatomic/buildah/imagebuildah/build.go') diff --git a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go index bcdcfb678..547b6b249 100644 --- a/vendor/github.com/projectatomic/buildah/imagebuildah/build.go +++ b/vendor/github.com/projectatomic/buildah/imagebuildah/build.go @@ -446,7 +446,12 @@ func (b *Executor) Copy(excludes []string, copies ...imagebuilder.Copy) error { sources = append(sources, filepath.Join(b.contextDir, src)) } } - if err := b.builder.Add(copy.Dest, copy.Download, buildah.AddAndCopyOptions{}, sources...); err != nil { + + options := buildah.AddAndCopyOptions{ + Chown: copy.Chown, + } + + if err := b.builder.Add(copy.Dest, copy.Download, options, sources...); err != nil { return err } } -- cgit v1.2.3-54-g00ecf