Merge pull request cri-o#7981 from kwilczynski/feature/update-contain…

…er-images-crio-1.30 Cherry-pick changes from containers/image/pull#2363
saschagrunert · Apr 12, 2024 · 71deaa3 · 71deaa3
2 parents 256fda5 + e480e5b
commit 71deaa3
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -21,7 +21,7 @@ require (
  github.com/containers/common v0.57.4
  github.com/containers/conmon v2.0.20+incompatible
  github.com/containers/conmon-rs v0.6.2-0.20230920142715-f5a362044a57
- github.com/containers/image/v5 v5.29.2
+ github.com/containers/image/v5 v5.29.3-0.20240409133913-ea4fcca19343
  github.com/containers/kubensmnt v1.2.0
  github.com/containers/ocicrypt v1.1.9
  github.com/containers/podman/v4 v4.9.3

diff --git a/go.sum b/go.sum
@@ -737,8 +737,8 @@ github.com/containers/conmon v2.0.20+incompatible h1:YbCVSFSCqFjjVwHTPINGdMX1F6J
 github.com/containers/conmon v2.0.20+incompatible/go.mod h1:hgwZ2mtuDrppv78a/cOBNiCm6O0UMWGx1mu7P00nu5I=
 github.com/containers/conmon-rs v0.6.2-0.20230920142715-f5a362044a57 h1:EHiHMe0cOPvBzi20g/f+NzhjhPFTxpyAkpRE4h1ZAzw=
 github.com/containers/conmon-rs v0.6.2-0.20230920142715-f5a362044a57/go.mod h1:rMhWT6H3demwJCFuT+Bc9b+T9oypfZ5SnPzOrt6QNkg=
-github.com/containers/image/v5 v5.29.2 h1:b8U0XYWhaQbKucK73IbmSm8WQyKAhKDbAHQc45XlsOw=
-github.com/containers/image/v5 v5.29.2/go.mod h1:kQ7qcDsps424ZAz24thD+x7+dJw1vgur3A9tTDsj97E=
+github.com/containers/image/v5 v5.29.3-0.20240409133913-ea4fcca19343 h1:xscjwgxozq2RUcCURl/S/ZGgsPOPAbulTJFcfc5Jtk4=
+github.com/containers/image/v5 v5.29.3-0.20240409133913-ea4fcca19343/go.mod h1:kQ7qcDsps424ZAz24thD+x7+dJw1vgur3A9tTDsj97E=
 github.com/containers/kubensmnt v1.2.0 h1:BDtkaOFQ5fN7FnB9kC6peMW50KkwI1KI8E9ROBFeQIg=
 github.com/containers/kubensmnt v1.2.0/go.mod h1:1/HG09N/a1+WSD3zkurzeWtqlKRSfUUnlIF/08zloqk=
 github.com/containers/libtrust v0.0.0-20230121012942-c1716e8a8d01 h1:Qzk5C6cYglewc+UyGf6lc8Mj2UaPTHy/iF2De0/77CA=

diff --git a/vendor/github.com/containers/image/v5/docker/docker_client.go b/vendor/github.com/containers/image/v5/docker/docker_client.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -262,7 +262,7 @@ github.com/containers/conmon/runner/config
 ## explicit; go 1.20
 github.com/containers/conmon-rs/internal/proto
 github.com/containers/conmon-rs/pkg/client
-# github.com/containers/image/v5 v5.29.2
+# github.com/containers/image/v5 v5.29.3-0.20240409133913-ea4fcca19343
 ## explicit; go 1.19
 github.com/containers/image/v5/copy
 github.com/containers/image/v5/directory