From 8d8817e61ebe76022f53caea5a520ea12d825861 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@gmail.com>
Date: Mon, 19 Feb 2018 12:58:31 -0500
Subject: Update c/image to 701221f0891d76aeac3f25912e6bb9f84e88de1c
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #358
Approved by: TomSweeneyRedHat
---
vendor/github.com/containers/image/copy/manifest.go | 5 +++++
vendor/github.com/containers/image/image/docker_schema1.go | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
(limited to 'vendor')
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.
--
cgit v1.2.3-54-g00ecf