mirror of
https://github.com/containers/skopeo.git
synced 2025-09-25 20:29:24 +00:00
fix(deps): update module github.com/containers/storage to v1.55.0
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
31
vendor/github.com/containers/storage/drivers/vfs/driver.go
generated
vendored
31
vendor/github.com/containers/storage/drivers/vfs/driver.go
generated
vendored
@@ -33,12 +33,10 @@ func Init(home string, options graphdriver.Options) (graphdriver.Driver, error)
|
||||
d := &Driver{
|
||||
name: "vfs",
|
||||
home: home,
|
||||
idMappings: idtools.NewIDMappingsFromMaps(options.UIDMaps, options.GIDMaps),
|
||||
imageStore: options.ImageStore,
|
||||
}
|
||||
|
||||
rootIDs := d.idMappings.RootPair()
|
||||
if err := idtools.MkdirAllAndChown(filepath.Join(home, "dir"), 0o700, rootIDs); err != nil {
|
||||
if err := os.MkdirAll(filepath.Join(home, "dir"), 0o700); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, option := range options.DriverOptions {
|
||||
@@ -79,7 +77,6 @@ type Driver struct {
|
||||
name string
|
||||
home string
|
||||
additionalHomes []string
|
||||
idMappings *idtools.IDMappings
|
||||
ignoreChownErrors bool
|
||||
naiveDiff graphdriver.DiffDriver
|
||||
updater graphdriver.LayerIDMapUpdater
|
||||
@@ -152,14 +149,21 @@ func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts, ro bool
|
||||
return fmt.Errorf("--storage-opt is not supported for vfs")
|
||||
}
|
||||
|
||||
idMappings := d.idMappings
|
||||
var uidMaps []idtools.IDMap
|
||||
var gidMaps []idtools.IDMap
|
||||
|
||||
if opts != nil && opts.IDMappings != nil {
|
||||
idMappings = opts.IDMappings
|
||||
uidMaps = opts.IDMappings.UIDs()
|
||||
gidMaps = opts.IDMappings.GIDs()
|
||||
}
|
||||
|
||||
rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
dir := d.dir2(id, ro)
|
||||
rootIDs := idMappings.RootPair()
|
||||
if err := idtools.MkdirAllAndChown(filepath.Dir(dir), 0o700, rootIDs); err != nil {
|
||||
if err := os.MkdirAll(filepath.Dir(dir), 0o700); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -174,21 +178,24 @@ func (d *Driver) create(id, parent string, opts *graphdriver.CreateOpts, ro bool
|
||||
rootPerms = os.FileMode(0o700)
|
||||
}
|
||||
|
||||
idPair := idtools.IDPair{UID: rootUID, GID: rootGID}
|
||||
if parent != "" {
|
||||
st, err := system.Stat(d.dir(parent))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
rootPerms = os.FileMode(st.Mode())
|
||||
rootIDs.UID = int(st.UID())
|
||||
rootIDs.GID = int(st.GID())
|
||||
idPair.UID = int(st.UID())
|
||||
idPair.GID = int(st.GID())
|
||||
}
|
||||
if err := idtools.MkdirAndChown(dir, rootPerms, rootIDs); err != nil {
|
||||
if err := idtools.MkdirAllAndChownNew(dir, rootPerms, idPair); err != nil {
|
||||
return err
|
||||
}
|
||||
labelOpts := []string{"level:s0"}
|
||||
if _, mountLabel, err := label.InitLabels(labelOpts); err == nil {
|
||||
label.SetFileLabel(dir, mountLabel)
|
||||
if err := label.SetFileLabel(dir, mountLabel); err != nil {
|
||||
logrus.Debugf("Set %s label to %q file ended with error: %v", mountLabel, dir, err)
|
||||
}
|
||||
}
|
||||
if parent != "" {
|
||||
parentDir, err := d.Get(parent, graphdriver.MountOpts{})
|
||||
|
Reference in New Issue
Block a user