summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@gmail.com>2018-02-19 12:58:31 -0500
committerAtomic Bot <atomic-devel@projectatomic.io>2018-02-20 09:11:33 +0000
commit8d8817e61ebe76022f53caea5a520ea12d825861 (patch)
tree0282c59066a28e5cd6b48afb2e813b0b83a1a087
parent635deb63586fdfb41a7595ef667ce1546bf5f9e2 (diff)
downloadpodman-8d8817e61ebe76022f53caea5a520ea12d825861.tar.gz
podman-8d8817e61ebe76022f53caea5a520ea12d825861.tar.bz2
podman-8d8817e61ebe76022f53caea5a520ea12d825861.zip
Update c/image to 701221f0891d76aeac3f25912e6bb9f84e88de1c
Signed-off-by: Matthew Heon <matthew.heon@gmail.com> Closes: #358 Approved by: TomSweeneyRedHat
-rw-r--r--vendor.conf2
-rw-r--r--vendor/github.com/containers/image/copy/manifest.go5
-rw-r--r--vendor/github.com/containers/image/image/docker_schema1.go2
3 files changed, 7 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf
index 559f5c66d..6879cd6d2 100644
--- a/vendor.conf
+++ b/vendor.conf
@@ -1,6 +1,6 @@
#
github.com/sirupsen/logrus v1.0.0
-github.com/containers/image 3ab2e31e6ff9fc2b21b81188c1f6cf545658ff4a
+github.com/containers/image 701221f0891d76aeac3f25912e6bb9f84e88de1c
github.com/docker/docker-credential-helpers d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
github.com/ostreedev/ostree-go master
github.com/containers/storage 1824cf917a6b42d8c41179e807bb20a5fd6c0f0a
diff --git a/vendor/github.com/containers/image/copy/manifest.go b/vendor/github.com/containers/image/copy/manifest.go
index 7e4cd10ef..c612c51a3 100644
--- a/vendor/github.com/containers/image/copy/manifest.go
+++ b/vendor/github.com/containers/image/copy/manifest.go
@@ -46,6 +46,11 @@ func (ic *imageCopier) determineManifestConversion(destSupportedManifestMIMEType
if err != nil { // This should have been cached?!
return "", nil, errors.Wrap(err, "Error reading manifest")
}
+ normalizedSrcType := manifest.NormalizedMIMEType(srcType)
+ if srcType != normalizedSrcType {
+ logrus.Debugf("Source manifest MIME type %s, treating it as %s", srcType, normalizedSrcType)
+ srcType = normalizedSrcType
+ }
if forceManifestMIMEType != "" {
destSupportedManifestMIMETypes = []string{forceManifestMIMEType}
diff --git a/vendor/github.com/containers/image/image/docker_schema1.go b/vendor/github.com/containers/image/image/docker_schema1.go
index c6a6989de..c486a2c34 100644
--- a/vendor/github.com/containers/image/image/docker_schema1.go
+++ b/vendor/github.com/containers/image/image/docker_schema1.go
@@ -95,7 +95,7 @@ func (m *manifestSchema1) imageInspectInfo() (*types.ImageInspectInfo, error) {
// This is a horribly specific interface, but computing InformationOnly.LayerDiffIDs can be very expensive to compute
// (most importantly it forces us to download the full layers even if they are already present at the destination).
func (m *manifestSchema1) UpdatedImageNeedsLayerDiffIDs(options types.ManifestUpdateOptions) bool {
- return options.ManifestMIMEType == manifest.DockerV2Schema2MediaType
+ return (options.ManifestMIMEType == manifest.DockerV2Schema2MediaType || options.ManifestMIMEType == imgspecv1.MediaTypeImageManifest)
}
// UpdatedImage returns a types.Image modified according to options.