Vendor in latest buildah and imagebuilder

We want to add the latest support for COPY --chown UID:GID.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #1289
Approved by: TomSweeneyRedHat
This commit is contained in:
Daniel J Walsh
2018-08-16 16:23:09 -04:00
committed by Atomic Bot
parent 89a9750b6d
commit 57e1600315
6 changed files with 30 additions and 9 deletions

View File

@ -27,6 +27,9 @@ type Copy struct {
Src []string
Dest string
Download bool
// If set, the owner:group for the destination. This value is passed
// to the executor for handling.
Chown string
}
// Run defines a run operation required in the container.
@ -51,7 +54,7 @@ func (logExecutor) Preserve(path string) error {
func (logExecutor) Copy(excludes []string, copies ...Copy) error {
for _, c := range copies {
log.Printf("COPY %v -> %s (from:%s download:%t)", c.Src, c.Dest, c.From, c.Download)
log.Printf("COPY %v -> %s (from:%s download:%t), chown: %s", c.Src, c.Dest, c.From, c.Download, c.Chown)
}
return nil
}