mirror of
https://github.com/containers/podman.git
synced 2025-12-01 10:38:05 +08:00
Bump github.com/containers/buildah from 1.16.2 to 1.16.4
Bumps [github.com/containers/buildah](https://github.com/containers/buildah) from 1.16.2 to 1.16.4. - [Release notes](https://github.com/containers/buildah/releases) - [Changelog](https://github.com/containers/buildah/blob/master/CHANGELOG.md) - [Commits](https://github.com/containers/buildah/compare/v1.16.2...v1.16.4) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
committed by
Daniel J Walsh
parent
defd427503
commit
9212e0499b
26
vendor/github.com/containers/buildah/add.go
generated
vendored
26
vendor/github.com/containers/buildah/add.go
generated
vendored
@@ -33,7 +33,8 @@ type AddAndCopyOptions struct {
|
||||
Chown string
|
||||
// PreserveOwnership, if Chown is not set, tells us to avoid setting
|
||||
// ownership of copied items to 0:0, instead using whatever ownership
|
||||
// information is already set. Not meaningful for remote sources.
|
||||
// information is already set. Not meaningful for remote sources or
|
||||
// local archives that we extract.
|
||||
PreserveOwnership bool
|
||||
// All of the data being copied will pass through Hasher, if set.
|
||||
// If the sources are URLs or files, their contents will be passed to
|
||||
@@ -210,7 +211,6 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
|
||||
|
||||
// Find out which user (and group) the destination should belong to.
|
||||
var chownDirs, chownFiles *idtools.IDPair
|
||||
var chmodDirs, chmodFiles *os.FileMode
|
||||
var user specs.User
|
||||
if options.Chown != "" {
|
||||
user, _, err = b.user(mountPoint, options.Chown)
|
||||
@@ -319,9 +319,9 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
|
||||
UIDMap: destUIDMap,
|
||||
GIDMap: destGIDMap,
|
||||
ChownDirs: chownDirs,
|
||||
ChmodDirs: chmodDirs,
|
||||
ChmodDirs: nil,
|
||||
ChownFiles: chownFiles,
|
||||
ChmodFiles: chmodFiles,
|
||||
ChmodFiles: nil,
|
||||
}
|
||||
putErr = copier.Put(mountPoint, extractDirectory, putOptions, io.TeeReader(pipeReader, hasher))
|
||||
}
|
||||
@@ -396,6 +396,10 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
|
||||
GIDMap: srcGIDMap,
|
||||
Excludes: options.Excludes,
|
||||
ExpandArchives: extract,
|
||||
ChownDirs: chownDirs,
|
||||
ChmodDirs: nil,
|
||||
ChownFiles: chownFiles,
|
||||
ChmodFiles: nil,
|
||||
StripSetuidBit: options.StripSetuidBit,
|
||||
StripSetgidBit: options.StripSetgidBit,
|
||||
StripStickyBit: options.StripStickyBit,
|
||||
@@ -423,12 +427,14 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
|
||||
_, putErr = io.Copy(hasher, pipeReader)
|
||||
} else {
|
||||
putOptions := copier.PutOptions{
|
||||
UIDMap: destUIDMap,
|
||||
GIDMap: destGIDMap,
|
||||
ChownDirs: chownDirs,
|
||||
ChmodDirs: chmodDirs,
|
||||
ChownFiles: chownFiles,
|
||||
ChmodFiles: chmodFiles,
|
||||
UIDMap: destUIDMap,
|
||||
GIDMap: destGIDMap,
|
||||
DefaultDirOwner: chownDirs,
|
||||
DefaultDirMode: nil,
|
||||
ChownDirs: nil,
|
||||
ChmodDirs: nil,
|
||||
ChownFiles: nil,
|
||||
ChmodFiles: nil,
|
||||
}
|
||||
putErr = copier.Put(mountPoint, extractDirectory, putOptions, io.TeeReader(pipeReader, hasher))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user