Correct missing sizes for manifest schema 1 images

Make sure to encode the updated sizes into image.DockerImageMetadata.Raw otherwise the changes will be lost. Signed-off-by: Michal Minář <miminar@redhat.com>
openshift · Sep 13, 2017 · 8c96906 · 8c96906
1 parent 233358f
commit 8c96906
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/dockerregistry/server/manifestschema1handler.go b/pkg/dockerregistry/server/manifestschema1handler.go
@@ -102,7 +102,7 @@ func (h *manifestSchema1Handler) FillImageMetadata(ctx context.Context, image *i
 	}
 	image.DockerImageMetadata.Object = meta
 
-	return nil
+	return encodeRawDockerImageMetadata(image, true)
 }
 
 func (h *manifestSchema1Handler) Manifest() distribution.Manifest {

diff --git a/pkg/dockerregistry/server/util.go b/pkg/dockerregistry/server/util.go
@@ -361,7 +361,11 @@ func imageMetadataFromManifest(image *imageapiv1.Image) error {
 		return fmt.Errorf("unrecognized Docker image manifest schema %d for %q (%s)", manifest.SchemaVersion, image.Name, image.DockerImageReference)
 	}
 
-	if image.DockerImageMetadata.Object != nil && len(image.DockerImageMetadata.Raw) == 0 {
+	return encodeRawDockerImageMetadata(image, true)
+}
+
+func encodeRawDockerImageMetadata(image *imageapiv1.Image, overwrite bool) error {
+	if image.DockerImageMetadata.Object != nil && (overwrite || len(image.DockerImageMetadata.Raw) == 0) {
 		meta, ok := image.DockerImageMetadata.Object.(*imageapi.DockerImage)
 		if !ok {
 			return fmt.Errorf("docker image metadata object is not docker image")