diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-08-16 16:23:09 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-17 11:40:46 +0000 |
| commit | 57e1600315c3b4657797d2605cc69d7343da034f (patch) | |
| tree | 93b75a75abd830dba091d82f17d87463b4d549fb /vendor/github.com/openshift/imagebuilder/builder.go | |
| parent | 89a9750b6dd55b6d647d43942c6f97c9e1bb4029 (diff) | |
| download | podman-57e1600315c3b4657797d2605cc69d7343da034f.tar.gz podman-57e1600315c3b4657797d2605cc69d7343da034f.tar.bz2 podman-57e1600315c3b4657797d2605cc69d7343da034f.zip | |
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
Diffstat (limited to 'vendor/github.com/openshift/imagebuilder/builder.go')
| -rw-r--r-- | vendor/github.com/openshift/imagebuilder/builder.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/github.com/openshift/imagebuilder/builder.go b/vendor/github.com/openshift/imagebuilder/builder.go index 6d6e4c38a..1c1afb119 100644 --- a/vendor/github.com/openshift/imagebuilder/builder.go +++ b/vendor/github.com/openshift/imagebuilder/builder.go @@ -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 } |