cmd/push-container-manifest: use additional-images rather than overwrite

in coreos/fedora-coreos-pipeline#1091 we started
publishing container images in multiples repos.
However the build.json was not reflecting that, only storing the last
pushed image data, overwriting it with each arch.

See #4038
See coreos/fedora-coreos-pipeline#1099

Author: jbtrystram

src/cmd-push-container-manifest

@@ -122,11 +122,17 @@ def main():
             arch = manifest['platform']['architecture']
             if arch in map_arch:
                 arch = map_arch[arch]
-            buildmetas[arch][args.metajsonname] = {
+            image = {
                 'image': args.repo,
                 'digest': manifest['digest'],
                 'tags': args.tags
             }
+            if buildmetas[arch].get(args.metajsonname):
+                additional_images = buildmetas[arch][args.metajsonname].get('additional-images', [])
+                additional_images.append(image)
+                buildmetas[arch][args.metajsonname]['additional-images'] = additional_images
+            else:
+                buildmetas[arch][args.metajsonname] = image
             buildmetas[arch].write(artifact_name=args.metajsonname)
 
 

src/v1.json

@@ -87,11 +87,41 @@
     },
     "primary-image": {
       "type": "object",
-      "extends": "#/image",
+      "required": [
+        "image"
+      ],
       "optional": [
+        "digest",
+        "tags",
+        "comment",
         "additional-images"
       ],
       "properties": {
+        "digest": {
+          "$id": "#/image/digest",
+          "type": "string",
+          "title": "Digest"
+        },
+        "comment": {
+          "$id": "#/image/comment",
+          "type": "string",
+          "title": "Comment"
+        },
+        "image": {
+          "$id": "#/image/image",
+          "type": "string",
+          "title": "Image"
+        },
+        "tags": {
+          "$id": "#/image/tags",
+          "type": "array",
+          "title": "Tags",
+          "items": {
+            "$id": "#/image/tags/item",
+            "title": "Tag",
+            "type": "string"
+          }
+       },
         "additional-images": {
           "$id": "#/image",
           "type": "array",