mirror of
https://github.com/containers/skopeo.git
synced 2025-09-03 07:35:02 +00:00
Bump github.com/containers/storage from 1.33.2 to 1.34.0
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.33.2 to 1.34.0. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/main/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.33.2...v1.34.0) --- updated-dependencies: - dependency-name: github.com/containers/storage dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
committed by
Daniel J Walsh
parent
252af41dba
commit
a23b9f532d
2
vendor/github.com/containers/storage/VERSION
generated
vendored
2
vendor/github.com/containers/storage/VERSION
generated
vendored
@@ -1 +1 @@
|
||||
1.33.2
|
||||
1.34.0
|
||||
|
42
vendor/github.com/containers/storage/drivers/overlay/check_115.go
generated
vendored
Normal file
42
vendor/github.com/containers/storage/drivers/overlay/check_115.go
generated
vendored
Normal file
@@ -0,0 +1,42 @@
|
||||
// +build !go1.16
|
||||
|
||||
package overlay
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/storage/pkg/archive"
|
||||
"github.com/containers/storage/pkg/system"
|
||||
)
|
||||
|
||||
func scanForMountProgramIndicators(home string) (detected bool, err error) {
|
||||
err = filepath.Walk(home, func(path string, info os.FileInfo, err error) error {
|
||||
if detected {
|
||||
return filepath.SkipDir
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
basename := filepath.Base(path)
|
||||
if strings.HasPrefix(basename, archive.WhiteoutPrefix) {
|
||||
detected = true
|
||||
return filepath.SkipDir
|
||||
}
|
||||
if info.IsDir() {
|
||||
xattrs, err := system.Llistxattr(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, xattr := range xattrs {
|
||||
if strings.HasPrefix(xattr, "user.fuseoverlayfs.") || strings.HasPrefix(xattr, "user.containers.") {
|
||||
detected = true
|
||||
return filepath.SkipDir
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
return detected, err
|
||||
}
|
42
vendor/github.com/containers/storage/drivers/overlay/check_116.go
generated
vendored
Normal file
42
vendor/github.com/containers/storage/drivers/overlay/check_116.go
generated
vendored
Normal file
@@ -0,0 +1,42 @@
|
||||
// +build go1.16
|
||||
|
||||
package overlay
|
||||
|
||||
import (
|
||||
"io/fs"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
"github.com/containers/storage/pkg/archive"
|
||||
"github.com/containers/storage/pkg/system"
|
||||
)
|
||||
|
||||
func scanForMountProgramIndicators(home string) (detected bool, err error) {
|
||||
err = filepath.WalkDir(home, func(path string, d fs.DirEntry, err error) error {
|
||||
if detected {
|
||||
return fs.SkipDir
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
basename := filepath.Base(path)
|
||||
if strings.HasPrefix(basename, archive.WhiteoutPrefix) {
|
||||
detected = true
|
||||
return fs.SkipDir
|
||||
}
|
||||
if d.IsDir() {
|
||||
xattrs, err := system.Llistxattr(path)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for _, xattr := range xattrs {
|
||||
if strings.HasPrefix(xattr, "user.fuseoverlayfs.") || strings.HasPrefix(xattr, "user.containers.") {
|
||||
detected = true
|
||||
return fs.SkipDir
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil
|
||||
})
|
||||
return detected, err
|
||||
}
|
27
vendor/github.com/containers/storage/drivers/overlay/overlay.go
generated
vendored
27
vendor/github.com/containers/storage/drivers/overlay/overlay.go
generated
vendored
@@ -266,9 +266,8 @@ func Init(home string, options graphdriver.Options) (graphdriver.Driver, error)
|
||||
}
|
||||
|
||||
if opts.mountProgram != "" {
|
||||
f, err := os.Create(getMountProgramFlagFile(home))
|
||||
if err == nil {
|
||||
f.Close()
|
||||
if err := ioutil.WriteFile(getMountProgramFlagFile(home), []byte("true"), 0600); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
// check if they are running over btrfs, aufs, zfs, overlay, or ecryptfs
|
||||
@@ -542,9 +541,29 @@ func SupportsNativeOverlay(graphroot, rundir string) (bool, error) {
|
||||
home := filepath.Join(graphroot, "overlay")
|
||||
runhome := filepath.Join(rundir, "overlay")
|
||||
|
||||
if _, err := os.Stat(getMountProgramFlagFile(home)); err == nil {
|
||||
var contents string
|
||||
flagContent, err := ioutil.ReadFile(getMountProgramFlagFile(home))
|
||||
if err == nil {
|
||||
contents = strings.TrimSpace(string(flagContent))
|
||||
}
|
||||
switch contents {
|
||||
case "true":
|
||||
logrus.Debugf("overlay storage already configured with a mount-program")
|
||||
return false, nil
|
||||
default:
|
||||
needsMountProgram, err := scanForMountProgramIndicators(home)
|
||||
if err != nil && !os.IsNotExist(err) {
|
||||
return false, err
|
||||
}
|
||||
if err := ioutil.WriteFile(getMountProgramFlagFile(home), []byte(fmt.Sprintf("%t", needsMountProgram)), 0600); err != nil && !os.IsNotExist(err) {
|
||||
return false, err
|
||||
}
|
||||
if needsMountProgram {
|
||||
return false, nil
|
||||
}
|
||||
// fall through to check if we find ourselves needing to use a
|
||||
// mount program now
|
||||
case "false":
|
||||
}
|
||||
|
||||
for _, dir := range []string{home, runhome} {
|
||||
|
2
vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go
generated
vendored
2
vendor/github.com/containers/storage/pkg/idtools/idtools_supported.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
// +build linux,cgo,!no_libsubid
|
||||
// +build linux,cgo,libsubid
|
||||
|
||||
package idtools
|
||||
|
||||
|
2
vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go
generated
vendored
2
vendor/github.com/containers/storage/pkg/idtools/idtools_unsupported.go
generated
vendored
@@ -1,4 +1,4 @@
|
||||
// +build !linux no_libsubid !cgo
|
||||
// +build !linux !libsubid !cgo
|
||||
|
||||
package idtools
|
||||
|
||||
|
Reference in New Issue
Block a user