containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #374 from containers/dependabot/go_modules/github.com/containers/storage-1.24.2 

Bump github.com/containers/storage from 1.24.1 to 1.24.2
This commit is contained in:
OpenShift Merge Robot 2020-12-07 16:48:59 -05:00 committed by GitHub
parent 7a054180bd b635bb1dd5
commit 4ca8b346e9
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/go.mod
View File

@ -6,7 +6,7 @@ require (
github.com/BurntSushi/toml v0.3.1
github.com/blang/semver v3.5.1+incompatible // indirect
github.com/containers/image/v5 v5.8.1
github.com/containers/storage v1.24.1
github.com/containers/storage v1.24.2
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v17.12.0-ce-rc1.0.20201020191947-73dc6a680cdd+incompatible
github.com/docker/go-units v0.4.0

4
common/go.sum
View File

@ -61,8 +61,8 @@ github.com/containers/libtrust v0.0.0-20190913040956-14b96171aa3b/go.mod h1:9rfv
github.com/containers/ocicrypt v1.0.3 h1:vYgl+RZ9Q3DPMuTfxmN+qp0X2Bj52uuY2vnt6GzVe1c=
github.com/containers/ocicrypt v1.0.3/go.mod h1:CUBa+8MRNL/VkpxYIpaMtgn1WgXGyvPQj8jcy0EVG6g=
github.com/containers/storage v1.23.7/go.mod h1:cUT2zHjtx+WlVri30obWmM2gpqpi8jfPsmIzP1TVpEI=
github.com/containers/storage v1.24.1 h1:1+f8fy6ly35c8SLet5jzZ8t0WJJs5+xSpfMAYw0R3kc=
github.com/containers/storage v1.24.1/go.mod h1:0xJL06Dmd+ZYXIUdnBUPN0JnhHGgwMkLvnnAonJfWJU=
github.com/containers/storage v1.24.2 h1:UYa08IVautEXv8vNPerf3mBMNed+gpH8FwMthO3KDC8=
github.com/containers/storage v1.24.2/go.mod h1:0xJL06Dmd+ZYXIUdnBUPN0JnhHGgwMkLvnnAonJfWJU=
github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=

2
common/vendor/github.com/containers/storage/VERSION generated vendored
View File

@ -1 +1 @@
1.24.1
1.24.2

1
common/vendor/github.com/containers/storage/utils.go generated vendored
View File

@ -255,6 +255,7 @@ func defaultStoreOptionsIsolated(rootless bool, rootlessUID int, storageConf str
if err != nil {
return storageOpts, err
}
return storageOpts, nil
}
_, err = os.Stat(storageConf)
if err != nil && !os.IsNotExist(err) {

2
common/vendor/modules.txt vendored
View File

@ -58,7 +58,7 @@ github.com/containers/image/v5/types
github.com/containers/libtrust
# github.com/containers/ocicrypt v1.0.3
github.com/containers/ocicrypt/spec
# github.com/containers/storage v1.24.1
# github.com/containers/storage v1.24.2
## explicit
github.com/containers/storage
github.com/containers/storage/drivers