diff --git a/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/cosa_v1.go b/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/cosa_v1.go index 6a6f0eb210..a35e85876c 100644 --- a/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/cosa_v1.go +++ b/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/cosa_v1.go @@ -1,7 +1,7 @@ package builds // generated by 'make schema' -// source hash: 144450d458f89f637ca487d353af3dfd60096ddbf3179da8e2b42b2bd2d0a6eb +// source hash: 1a456ce336dcdcc026bc6c3bb171f8a3a71cb39bebd38986e6e9ef3a2a25cf73 type AdvisoryDiff []AdvisoryDiffItems @@ -27,10 +27,6 @@ type Artifact struct { UncompressedSize int `json:"uncompressed-size,omitempty"` } -type BaseOsContainer struct { - Image string `json:"image"` -} - type Build struct { AdvisoryDiffAgainstParent AdvisoryDiff `json:"parent-advisories-diff,omitempty"` AdvisoryDiffBetweenBuilds AdvisoryDiff `json:"advisories-diff,omitempty"` @@ -38,7 +34,7 @@ type Build struct { Amis []Amis `json:"amis,omitempty"` Architecture string `json:"coreos-assembler.basearch,omitempty"` Azure *Cloudartifact `json:"azure,omitempty"` - BaseOsContainer *BaseOsContainer `json:"base-oscontainer,omitempty"` + BaseOsContainer *Image `json:"base-oscontainer,omitempty"` BuildArtifacts *BuildArtifacts `json:"images,omitempty"` BuildID string `json:"buildid"` BuildRef string `json:"ref,omitempty"` @@ -54,7 +50,7 @@ type Build struct { CosaImageChecksum string `json:"coreos-assembler.image-config-checksum,omitempty"` CosaImageVersion int `json:"coreos-assembler.image-genver,omitempty"` Extensions *Extensions `json:"extensions,omitempty"` - ExtensionsContainer *ExtensionsContainer `json:"extensions-container,omitempty"` + ExtensionsContainer *Image `json:"extensions-container,omitempty"` FedoraCoreOsParentCommit string `json:"fedora-coreos.parent-commit,omitempty"` FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"` Gcp *Gcp `json:"gcp,omitempty"` @@ -133,10 +129,6 @@ type Extensions struct { Sha256 string `json:"sha256"` } -type ExtensionsContainer struct { - Image string `json:"image"` -} - type Gcp struct { ImageFamily string `json:"family,omitempty"` ImageName string `json:"image"` @@ -153,7 +145,7 @@ type Git struct { type Image struct { Comment string `json:"comment,omitempty"` - Digest string `json:"digest"` + Digest string `json:"digest,omitempty"` Image string `json:"image"` } diff --git a/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema_doc.go b/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema_doc.go index 204ec12074..1693f078a8 100644 --- a/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema_doc.go +++ b/mantle/vendor/github.com/coreos/coreos-assembler/pkg/builds/schema_doc.go @@ -1,5 +1,5 @@ // Generated by ./generate-schema.sh -// Source hash: 144450d458f89f637ca487d353af3dfd60096ddbf3179da8e2b42b2bd2d0a6eb +// Source hash: 1a456ce336dcdcc026bc6c3bb171f8a3a71cb39bebd38986e6e9ef3a2a25cf73 // DO NOT EDIT package builds @@ -56,10 +56,10 @@ var generatedSchemaJSON = `{ "image": { "type": "object", "required": [ - "digest", "image" ], "optional": [ + "digest", "comment" ], "properties": { @@ -875,31 +875,13 @@ var generatedSchemaJSON = `{ "$id": "#/properties/base-oscontainer", "type": "object", "title": "Base OS container", - "required": [ - "image" - ], - "properties": { - "image": { - "$id": "#/properties/base-oscontainer/image", - "type": "string", - "title": "Image" - } - } + "$ref": "#/definitions/image" }, "extensions-container": { "$id": "#/properties/extensions-container", "type": "object", "title": "Extensions container", - "required": [ - "image" - ], - "properties": { - "image": { - "$id": "#/properties/extensions-container/image", - "type": "string", - "title": "Image" - } - } + "$ref": "#/definitions/image" }, "gcp": { "$id": "#/properties/gcp", diff --git a/pkg/builds/cosa_v1.go b/pkg/builds/cosa_v1.go index 6a6f0eb210..a35e85876c 100644 --- a/pkg/builds/cosa_v1.go +++ b/pkg/builds/cosa_v1.go @@ -1,7 +1,7 @@ package builds // generated by 'make schema' -// source hash: 144450d458f89f637ca487d353af3dfd60096ddbf3179da8e2b42b2bd2d0a6eb +// source hash: 1a456ce336dcdcc026bc6c3bb171f8a3a71cb39bebd38986e6e9ef3a2a25cf73 type AdvisoryDiff []AdvisoryDiffItems @@ -27,10 +27,6 @@ type Artifact struct { UncompressedSize int `json:"uncompressed-size,omitempty"` } -type BaseOsContainer struct { - Image string `json:"image"` -} - type Build struct { AdvisoryDiffAgainstParent AdvisoryDiff `json:"parent-advisories-diff,omitempty"` AdvisoryDiffBetweenBuilds AdvisoryDiff `json:"advisories-diff,omitempty"` @@ -38,7 +34,7 @@ type Build struct { Amis []Amis `json:"amis,omitempty"` Architecture string `json:"coreos-assembler.basearch,omitempty"` Azure *Cloudartifact `json:"azure,omitempty"` - BaseOsContainer *BaseOsContainer `json:"base-oscontainer,omitempty"` + BaseOsContainer *Image `json:"base-oscontainer,omitempty"` BuildArtifacts *BuildArtifacts `json:"images,omitempty"` BuildID string `json:"buildid"` BuildRef string `json:"ref,omitempty"` @@ -54,7 +50,7 @@ type Build struct { CosaImageChecksum string `json:"coreos-assembler.image-config-checksum,omitempty"` CosaImageVersion int `json:"coreos-assembler.image-genver,omitempty"` Extensions *Extensions `json:"extensions,omitempty"` - ExtensionsContainer *ExtensionsContainer `json:"extensions-container,omitempty"` + ExtensionsContainer *Image `json:"extensions-container,omitempty"` FedoraCoreOsParentCommit string `json:"fedora-coreos.parent-commit,omitempty"` FedoraCoreOsParentVersion string `json:"fedora-coreos.parent-version,omitempty"` Gcp *Gcp `json:"gcp,omitempty"` @@ -133,10 +129,6 @@ type Extensions struct { Sha256 string `json:"sha256"` } -type ExtensionsContainer struct { - Image string `json:"image"` -} - type Gcp struct { ImageFamily string `json:"family,omitempty"` ImageName string `json:"image"` @@ -153,7 +145,7 @@ type Git struct { type Image struct { Comment string `json:"comment,omitempty"` - Digest string `json:"digest"` + Digest string `json:"digest,omitempty"` Image string `json:"image"` } diff --git a/pkg/builds/schema_doc.go b/pkg/builds/schema_doc.go index 204ec12074..1693f078a8 100644 --- a/pkg/builds/schema_doc.go +++ b/pkg/builds/schema_doc.go @@ -1,5 +1,5 @@ // Generated by ./generate-schema.sh -// Source hash: 144450d458f89f637ca487d353af3dfd60096ddbf3179da8e2b42b2bd2d0a6eb +// Source hash: 1a456ce336dcdcc026bc6c3bb171f8a3a71cb39bebd38986e6e9ef3a2a25cf73 // DO NOT EDIT package builds @@ -56,10 +56,10 @@ var generatedSchemaJSON = `{ "image": { "type": "object", "required": [ - "digest", "image" ], "optional": [ + "digest", "comment" ], "properties": { @@ -875,31 +875,13 @@ var generatedSchemaJSON = `{ "$id": "#/properties/base-oscontainer", "type": "object", "title": "Base OS container", - "required": [ - "image" - ], - "properties": { - "image": { - "$id": "#/properties/base-oscontainer/image", - "type": "string", - "title": "Image" - } - } + "$ref": "#/definitions/image" }, "extensions-container": { "$id": "#/properties/extensions-container", "type": "object", "title": "Extensions container", - "required": [ - "image" - ], - "properties": { - "image": { - "$id": "#/properties/extensions-container/image", - "type": "string", - "title": "Image" - } - } + "$ref": "#/definitions/image" }, "gcp": { "$id": "#/properties/gcp", diff --git a/src/cmd-push-container b/src/cmd-push-container index 2a8a8b5e95..ba1ddec687 100755 --- a/src/cmd-push-container +++ b/src/cmd-push-container @@ -68,7 +68,10 @@ with tempfile.NamedTemporaryFile(dir='tmp', prefix='push-container-digestfile') container = 'base-oscontainer' if args.image != 'ostree': container = args.image - meta[container] = {'image': f"{container_name}@{digest}"} + meta[container] = { + 'image': container_name, + 'digest': digest + } metapath_new = f"{metapath}.new" with open(metapath_new, 'w') as f: json.dump(meta, f, sort_keys=True) diff --git a/src/cmd-push-container-manifest b/src/cmd-push-container-manifest index a02867c98a..e0f61b666f 100755 --- a/src/cmd-push-container-manifest +++ b/src/cmd-push-container-manifest @@ -68,7 +68,10 @@ def main(): # Update the meta.json in each build/arch metadata for _, buildmeta in buildmetas.items(): - buildmeta[args.metajsonname] = {'image': f"{args.repo}@{digest}"} + buildmeta[args.metajsonname] = { + 'image': args.repo, + 'digest': digest + } buildmeta.write(artifact_name=args.metajsonname) diff --git a/src/v1.json b/src/v1.json index e8414ff12d..096467fc75 100644 --- a/src/v1.json +++ b/src/v1.json @@ -50,10 +50,10 @@ "image": { "type": "object", "required": [ - "digest", "image" ], "optional": [ + "digest", "comment" ], "properties": { @@ -869,31 +869,13 @@ "$id": "#/properties/base-oscontainer", "type": "object", "title": "Base OS container", - "required": [ - "image" - ], - "properties": { - "image": { - "$id": "#/properties/base-oscontainer/image", - "type": "string", - "title": "Image" - } - } + "$ref": "#/definitions/image" }, "extensions-container": { "$id": "#/properties/extensions-container", "type": "object", "title": "Extensions container", - "required": [ - "image" - ], - "properties": { - "image": { - "$id": "#/properties/extensions-container/image", - "type": "string", - "title": "Image" - } - } + "$ref": "#/definitions/image" }, "gcp": { "$id": "#/properties/gcp", @@ -970,4 +952,4 @@ "$ref": "#/definitions/image" } } -} \ No newline at end of file +}