mirror of
https://github.com/containers/skopeo.git
synced 2025-09-22 02:18:41 +00:00
Update c/image with https://github.com/containers/image/pull/1944
... to update github.com/opencontainers/image-spec to v1.1.0-rc3. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
2
vendor/github.com/opencontainers/image-spec/schema/config-schema.json
generated
vendored
2
vendor/github.com/opencontainers/image-spec/schema/config-schema.json
generated
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"description": "OpenContainer Config Specification",
|
||||
"$schema": "https://json-schema.org/draft-04/schema#",
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"id": "https://opencontainers.org/schema/image/config",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
10
vendor/github.com/opencontainers/image-spec/schema/content-descriptor.json
generated
vendored
10
vendor/github.com/opencontainers/image-spec/schema/content-descriptor.json
generated
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"description": "OpenContainer Content Descriptor Specification",
|
||||
"$schema": "https://json-schema.org/draft-04/schema#",
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"id": "https://opencontainers.org/schema/descriptor",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -20,6 +20,14 @@
|
||||
"description": "a list of urls from which this object may be downloaded",
|
||||
"$ref": "defs-descriptor.json#/definitions/urls"
|
||||
},
|
||||
"data": {
|
||||
"description": "an embedding of the targeted content (base64 encoded)",
|
||||
"$ref": "defs.json#/definitions/base64"
|
||||
},
|
||||
"artifactType": {
|
||||
"description": "the IANA media type of this artifact",
|
||||
"$ref": "defs-descriptor.json#/definitions/mediaType"
|
||||
},
|
||||
"annotations": {
|
||||
"id": "https://opencontainers.org/schema/descriptor/annotations",
|
||||
"$ref": "defs-descriptor.json#/definitions/annotations"
|
||||
|
6
vendor/github.com/opencontainers/image-spec/schema/defs.json
generated
vendored
6
vendor/github.com/opencontainers/image-spec/schema/defs.json
generated
vendored
@@ -61,6 +61,12 @@
|
||||
}
|
||||
]
|
||||
},
|
||||
"base64": {
|
||||
"type": "string",
|
||||
"media": {
|
||||
"binaryEncoding": "base64"
|
||||
}
|
||||
},
|
||||
"stringPointer": {
|
||||
"oneOf": [
|
||||
{
|
||||
|
2
vendor/github.com/opencontainers/image-spec/schema/image-index-schema.json
generated
vendored
2
vendor/github.com/opencontainers/image-spec/schema/image-index-schema.json
generated
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"description": "OpenContainer Image Index Specification",
|
||||
"$schema": "https://json-schema.org/draft-04/schema#",
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"id": "https://opencontainers.org/schema/image/index",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
2
vendor/github.com/opencontainers/image-spec/schema/image-layout-schema.json
generated
vendored
2
vendor/github.com/opencontainers/image-spec/schema/image-layout-schema.json
generated
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"description": "OpenContainer Image Layout Schema",
|
||||
"$schema": "https://json-schema.org/draft-04/schema#",
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"id": "https://opencontainers.org/schema/image/layout",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
9
vendor/github.com/opencontainers/image-spec/schema/image-manifest-schema.json
generated
vendored
9
vendor/github.com/opencontainers/image-spec/schema/image-manifest-schema.json
generated
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"description": "OpenContainer Image Manifest Specification",
|
||||
"$schema": "https://json-schema.org/draft-04/schema#",
|
||||
"$schema": "http://json-schema.org/draft-04/schema#",
|
||||
"id": "https://opencontainers.org/schema/image/manifest",
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -15,9 +15,16 @@
|
||||
"description": "the mediatype of the referenced object",
|
||||
"$ref": "defs-descriptor.json#/definitions/mediaType"
|
||||
},
|
||||
"artifactType": {
|
||||
"description": "the artifact mediatype of the referenced object",
|
||||
"$ref": "defs-descriptor.json#/definitions/mediaType"
|
||||
},
|
||||
"config": {
|
||||
"$ref": "content-descriptor.json"
|
||||
},
|
||||
"subject": {
|
||||
"$ref": "content-descriptor.json"
|
||||
},
|
||||
"layers": {
|
||||
"type": "array",
|
||||
"minItems": 1,
|
||||
|
8
vendor/github.com/opencontainers/image-spec/schema/validator.go
generated
vendored
8
vendor/github.com/opencontainers/image-spec/schema/validator.go
generated
vendored
@@ -92,7 +92,7 @@ func (v Validator) Validate(src io.Reader) error {
|
||||
|
||||
type unimplemented string
|
||||
|
||||
func (v unimplemented) Validate(src io.Reader) error {
|
||||
func (v unimplemented) Validate(_ io.Reader) error {
|
||||
return fmt.Errorf("%s: unimplemented", v)
|
||||
}
|
||||
|
||||
@@ -117,9 +117,9 @@ func validateManifest(r io.Reader) error {
|
||||
if layer.MediaType != string(v1.MediaTypeImageLayer) &&
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerGzip) &&
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerZstd) &&
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerNonDistributable) &&
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerNonDistributableGzip) &&
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerNonDistributableZstd) {
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerNonDistributable) && //nolint:staticcheck
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerNonDistributableGzip) && //nolint:staticcheck
|
||||
layer.MediaType != string(v1.MediaTypeImageLayerNonDistributableZstd) { //nolint:staticcheck
|
||||
fmt.Printf("warning: layer %s has an unknown media type: %s\n", layer.Digest, layer.MediaType)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user