summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-15 12:13:58 +0200
committerGitHub <noreply@github.com>2020-09-15 12:13:58 +0200
commitd5db2af340b94b9900cf194e35d57af40a695fe1 (patch)
tree5f4e23d6f662e62e00f9a6e23097f313dced3092
parent5c47a331ba768d57ef94b9595415500f4e911964 (diff)
parentba3168027282b56b1164d0ecbb603c6f123d9958 (diff)
downloadpodman-d5db2af340b94b9900cf194e35d57af40a695fe1.tar.gz
podman-d5db2af340b94b9900cf194e35d57af40a695fe1.tar.bz2
podman-d5db2af340b94b9900cf194e35d57af40a695fe1.zip
Merge pull request #7634 from vrothberg/vendor-image
vendor github.com/containers/image/v5@v5.6.0
-rw-r--r--go.mod2
-rw-r--r--vendor/modules.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/go.mod b/go.mod
index 6b40075be..fcfd199b9 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
github.com/containers/buildah v1.16.1
github.com/containers/common v0.22.0
github.com/containers/conmon v2.0.20+incompatible
- github.com/containers/image/v5 v5.5.2
+ github.com/containers/image/v5 v5.6.0
github.com/containers/psgo v1.5.1
github.com/containers/storage v1.23.5
github.com/coreos/go-systemd/v22 v22.1.0
diff --git a/vendor/modules.txt b/vendor/modules.txt
index ffd90f5a5..9959c9efb 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -99,7 +99,7 @@ github.com/containers/common/pkg/sysinfo
github.com/containers/common/version
# github.com/containers/conmon v2.0.20+incompatible
github.com/containers/conmon/runner/config
-# github.com/containers/image/v5 v5.5.2 => github.com/containers/image/v5 v5.5.2-0.20200902171422-1c313b2d23e0
+# github.com/containers/image/v5 v5.6.0 => github.com/containers/image/v5 v5.5.2-0.20200902171422-1c313b2d23e0
github.com/containers/image/v5/copy
github.com/containers/image/v5/directory
github.com/containers/image/v5/directory/explicitfilepath