opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3149 from nalind/bump-storage

Browse Source 
Bump github.com/containers/storage to v1.12.7
This commit is contained in:
OpenShift Merge Robot
2019-05-17 17:36:08 +02:00
committed by GitHub
parent 0e20ae0b3a fc4e5f2580
commit 07b87b1390
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -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
View File

@ -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
View File

@ -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

4
vendor/github.com/containers/storage/store.go generated vendored
View File

@ -1197,19 +1197,21 @@ func (s *store) CreateContainer(id string, names []string, image, layer, metadat
} }
imageID = cimage.ID imageID = cimage.ID
if cimage.TopLayer != "" {
createMappedLayer := imageHomeStore == istore createMappedLayer := imageHomeStore == istore
ilayer, err := s.imageTopLayerForMapping(cimage, imageHomeStore, createMappedLayer, rlstore, lstores, idMappingsOptions) ilayer, err := s.imageTopLayerForMapping(cimage, imageHomeStore, createMappedLayer, rlstore, lstores, idMappingsOptions)
if err != nil { if err != nil {
return nil, err return nil, err
} }
imageTopLayer = ilayer imageTopLayer = ilayer
if !options.HostUIDMapping && len(options.UIDMap) == 0 { if !options.HostUIDMapping && len(options.UIDMap) == 0 {
uidMap = ilayer.UIDMap uidMap = ilayer.UIDMap
} }
if !options.HostGIDMapping && len(options.GIDMap) == 0 { if !options.HostGIDMapping && len(options.GIDMap) == 0 {
gidMap = ilayer.GIDMap gidMap = ilayer.GIDMap
} }
}
} else { } else {
rlstore.Lock() rlstore.Lock()
defer rlstore.Unlock() defer rlstore.Unlock()