mirror of
https://github.com/containers/podman
synced 2024-10-20 17:23:30 +00:00
Bump github.com/containers/storage to v1.12.7
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
parent
0e20ae0b3a
commit
fc4e5f2580
|
@ -19,7 +19,7 @@ github.com/containers/image v1.5.1
|
||||||
github.com/vbauerster/mpb v3.3.4
|
github.com/vbauerster/mpb v3.3.4
|
||||||
github.com/mattn/go-isatty v0.0.4
|
github.com/mattn/go-isatty v0.0.4
|
||||||
github.com/VividCortex/ewma v1.1.1
|
github.com/VividCortex/ewma v1.1.1
|
||||||
github.com/containers/storage v1.12.6
|
github.com/containers/storage v1.12.7
|
||||||
github.com/containers/psgo v1.2.1
|
github.com/containers/psgo v1.2.1
|
||||||
github.com/coreos/go-systemd v14
|
github.com/coreos/go-systemd v14
|
||||||
github.com/coreos/pkg v4
|
github.com/coreos/pkg v4
|
||||||
|
|
4
vendor/github.com/containers/storage/layers.go
generated
vendored
4
vendor/github.com/containers/storage/layers.go
generated
vendored
|
@ -402,12 +402,10 @@ func (r *layerStore) Save() error {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
defer r.Touch()
|
||||||
if err := ioutils.AtomicWriteFile(rpath, jldata, 0600); err != nil {
|
if err := ioutils.AtomicWriteFile(rpath, jldata, 0600); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if !r.IsReadWrite() {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
r.mountsLockfile.Lock()
|
r.mountsLockfile.Lock()
|
||||||
defer r.mountsLockfile.Unlock()
|
defer r.mountsLockfile.Unlock()
|
||||||
defer r.mountsLockfile.Touch()
|
defer r.mountsLockfile.Touch()
|
||||||
|
|
2
vendor/github.com/containers/storage/layers_ffjson.go
generated
vendored
2
vendor/github.com/containers/storage/layers_ffjson.go
generated
vendored
|
@ -1,5 +1,5 @@
|
||||||
// Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
|
// Code generated by ffjson <https://github.com/pquerna/ffjson>. DO NOT EDIT.
|
||||||
// source: layers.go
|
// source: ./layers.go
|
||||||
|
|
||||||
package storage
|
package storage
|
||||||
|
|
||||||
|
|
24
vendor/github.com/containers/storage/store.go
generated
vendored
24
vendor/github.com/containers/storage/store.go
generated
vendored
|
@ -1197,18 +1197,20 @@ func (s *store) CreateContainer(id string, names []string, image, layer, metadat
|
||||||
}
|
}
|
||||||
imageID = cimage.ID
|
imageID = cimage.ID
|
||||||
|
|
||||||
createMappedLayer := imageHomeStore == istore
|
if cimage.TopLayer != "" {
|
||||||
|
createMappedLayer := imageHomeStore == istore
|
||||||
|
ilayer, err := s.imageTopLayerForMapping(cimage, imageHomeStore, createMappedLayer, rlstore, lstores, idMappingsOptions)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
imageTopLayer = ilayer
|
||||||
|
|
||||||
ilayer, err := s.imageTopLayerForMapping(cimage, imageHomeStore, createMappedLayer, rlstore, lstores, idMappingsOptions)
|
if !options.HostUIDMapping && len(options.UIDMap) == 0 {
|
||||||
if err != nil {
|
uidMap = ilayer.UIDMap
|
||||||
return nil, err
|
}
|
||||||
}
|
if !options.HostGIDMapping && len(options.GIDMap) == 0 {
|
||||||
imageTopLayer = ilayer
|
gidMap = ilayer.GIDMap
|
||||||
if !options.HostUIDMapping && len(options.UIDMap) == 0 {
|
}
|
||||||
uidMap = ilayer.UIDMap
|
|
||||||
}
|
|
||||||
if !options.HostGIDMapping && len(options.GIDMap) == 0 {
|
|
||||||
gidMap = ilayer.GIDMap
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
rlstore.Lock()
|
rlstore.Lock()
|
||||||
|
|
Loading…
Reference in a new issue