Merge pull request containers#1771 from rhatdan/vendor

Bump containers/image to v3.0.2 to fix keyring issue
shlomopongartz · Aug 8, 2019 · 95cb061 · 95cb061
2 parents f4cfe9c + 6ba7c47
commit 95cb061
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 21 deletions.
diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
  github.com/blang/semver v3.5.0+incompatible // indirect
  github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
  github.com/containernetworking/cni v0.7.1
- github.com/containers/image v3.0.1+incompatible
+ github.com/containers/image v3.0.2+incompatible
  github.com/containers/storage v1.13.1
  github.com/cyphar/filepath-securejoin v0.2.1
  github.com/docker/distribution v0.0.0-20170817175659-5f6282db7d65

diff --git a/go.sum b/go.sum
@@ -35,6 +35,8 @@ github.com/containers/image v3.0.0+incompatible h1:pdUHY//H+3jYNnoTt+rqY8NsStX4Z
 github.com/containers/image v3.0.0+incompatible/go.mod h1:8Vtij257IWSanUQKe1tAeNOm2sRVkSqQTVQ1IlwI3+M=
 github.com/containers/image v3.0.1+incompatible h1:VlNEQUI1JHa1SJfJ4jz/GBt7gpk+aRYGR6TUKsxXMkU=
 github.com/containers/image v3.0.1+incompatible/go.mod h1:8Vtij257IWSanUQKe1tAeNOm2sRVkSqQTVQ1IlwI3+M=
+github.com/containers/image v3.0.2+incompatible h1:B1lqAE8MUPCrsBLE86J0gnXleeRq8zJnQryhiiGQNyE=
+github.com/containers/image v3.0.2+incompatible/go.mod h1:8Vtij257IWSanUQKe1tAeNOm2sRVkSqQTVQ1IlwI3+M=
 github.com/containers/storage v1.12.10-0.20190725063046-8038df61d6f6 h1:c7Fq9bbRl0Ua6swRHAH8rkrK2fSt6K+ZBrXHD50kDR4=
 github.com/containers/storage v1.12.10-0.20190725063046-8038df61d6f6/go.mod h1:QsZp4XMJjyPNNbQHZeyNW3OmhwsWviI+7S6iOcu6a4c=
 github.com/containers/storage v1.12.13 h1:GtaLCY8p1Drlk1Oew581jGvB137UaO+kpz0HII67T0A=

diff --git a/vendor/github.com/containers/image/ostree/ostree_src.go b/vendor/github.com/containers/image/ostree/ostree_src.go
diff --git a/vendor/github.com/containers/image/pkg/docker/config/config.go b/vendor/github.com/containers/image/pkg/docker/config/config.go
diff --git a/vendor/github.com/containers/image/version/version.go b/vendor/github.com/containers/image/version/version.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -38,7 +38,7 @@ github.com/containernetworking/cni/pkg/invoke
 github.com/containernetworking/cni/pkg/types
 github.com/containernetworking/cni/pkg/types/020
 github.com/containernetworking/cni/pkg/types/current
-# github.com/containers/image v3.0.1+incompatible
+# github.com/containers/image v3.0.2+incompatible
 github.com/containers/image/copy
 github.com/containers/image/directory
 github.com/containers/image/docker