File 0001-image-make-layer-validation-work.patch of Package oci-image-tools

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-image-make-layer-validation-work.patch of Package oci-image-tools (Revision e52d312694f8a175b00b54d57cb079fa)

Currently displaying revision e52d312694f8a175b00b54d57cb079fa , Show latest

From 950230c87f912a1fe0d55cd305b36cef3630c12d Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Thu, 9 Feb 2017 02:24:42 +1100
Subject: [PATCH] image: make layer validation work

Most recently, the validation was broken because the image-spec was
re-vendored but the code handling MediaType validation was not updated.

This change (among others) broke umoci's tests because we run the
validation code to ensure our images are always valid, and the
validation incorrectly flagged our images as invalid.

Fixes: ff477b3a7e85 ("vendor:update")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
---
 image/manifest.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/image/manifest.go b/image/manifest.go
index 6a5e9ba3372f..39d439562d86 100644
--- a/image/manifest.go
+++ b/image/manifest.go
@@ -75,8 +75,15 @@ func (m *manifest) validate(w walker) error {
 		return errors.Wrap(err, "config validation failed")
 	}
 
+	validLayerMediaTypes := []string{
+		v1.MediaTypeImageLayer,
+		v1.MediaTypeImageLayerGzip,
+		v1.MediaTypeImageLayerNonDistributable,
+		v1.MediaTypeImageLayerNonDistributableGzip,
+	}
+
 	for _, d := range m.Layers {
-		if err := d.validate(w, []string{v1.MediaTypeImageLayer}); err != nil {
+		if err := d.validate(w, validLayerMediaTypes); err != nil {
 			return errors.Wrap(err, "layer validation failed")
 		}
 	}
-- 
2.11.0

Places

File 0001-image-make-layer-validation-work.patch of Package oci-image-tools (Revision e52d312694f8a175b00b54d57cb079fa)

Places