@@ -62,7 +62,7 @@ google.golang.org/grpc v1.3.0

 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly

 github.com/opencontainers/runc 2d41c047c83e09a6d61d464906feb2a2f3c52aa4 https://github.com/docker/runc

-github.com/opencontainers/image-spec f03dbe35d449c54915d235f1a3cf8f585a24babe

+github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13

 github.com/opencontainers/runtime-spec d42f1eb741e6361e858d83fc75aa6893b66292c4 # specs

 github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0

new file mode 100644

@@ -0,0 +1,56 @@

+// Copyright 2016 The Linux Foundation

+//

+// Licensed under the Apache License, Version 2.0 (the "License");

+// you may not use this file except in compliance with the License.

+// You may obtain a copy of the License at

+//

+//     http://www.apache.org/licenses/LICENSE-2.0

+//

+// Unless required by applicable law or agreed to in writing, software

+// distributed under the License is distributed on an "AS IS" BASIS,

+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+// See the License for the specific language governing permissions and

+// limitations under the License.

+

+package v1

+

+const (

+	// AnnotationCreated is the annotation key for the date and time on which the image was built (date-time string as defined by RFC 3339).

+	AnnotationCreated = "org.opencontainers.image.created"

+

+	// AnnotationAuthors is the annotation key for the contact details of the people or organization responsible for the image (freeform string).

+	AnnotationAuthors = "org.opencontainers.image.authors"

+

+	// AnnotationURL is the annotation key for the URL to find more information on the image.

+	AnnotationURL = "org.opencontainers.image.url"

+

+	// AnnotationDocumentation is the annotation key for the URL to get documentation on the image.

+	AnnotationDocumentation = "org.opencontainers.image.documentation"

+

+	// AnnotationSource is the annotation key for the URL to get source code for building the image.

+	AnnotationSource = "org.opencontainers.image.source"

+

+	// AnnotationVersion is the annotation key for the version of the packaged software.

+	// The version MAY match a label or tag in the source code repository.

+	// The version MAY be Semantic versioning-compatible.

+	AnnotationVersion = "org.opencontainers.image.version"

+

+	// AnnotationRevision is the annotation key for the source control revision identifier for the packaged software.

+	AnnotationRevision = "org.opencontainers.image.revision"

+

+	// AnnotationVendor is the annotation key for the name of the distributing entity, organization or individual.

+	AnnotationVendor = "org.opencontainers.image.vendor"

+

+	// AnnotationLicenses is the annotation key for the license(s) under which contained software is distributed as an SPDX License Expression.

+	AnnotationLicenses = "org.opencontainers.image.licenses"

+

+	// AnnotationRefName is the annotation key for the name of the reference for a target.

+	// SHOULD only be considered valid when on descriptors on `index.json` within image layout.

+	AnnotationRefName = "org.opencontainers.image.ref.name"

+

+	// AnnotationTitle is the annotation key for the human-readable title of the image.

+	AnnotationTitle = "org.opencontainers.image.title"

+

+	// AnnotationDescription is the annotation key for the human-readable description of the software packaged in the image.

+	AnnotationDescription = "org.opencontainers.image.description"

+)

@@ -51,7 +51,7 @@ type Platform struct {

 	OS string `json:"os"`

 	// OSVersion is an optional field specifying the operating system

-	// version, for example `10.0.10586`.

+	// version, for example on Windows `10.0.14393.1066`.

 	OSVersion string `json:"os.version,omitempty"`

 	// OSFeatures is an optional field specifying an array of strings,

@@ -59,10 +59,6 @@ type Platform struct {

 	OSFeatures []string `json:"os.features,omitempty"`

 	// Variant is an optional field specifying a variant of the CPU, for

-	// example `ppc64le` to specify a little-endian version of a PowerPC CPU.

+	// example `v7` to specify ARMv7 when architecture is `arm`.

 	Variant string `json:"variant,omitempty"`

-

-	// Features is an optional field specifying an array of strings, each

-	// listing a required CPU feature (for example `sse4` or `aes`).

-	Features []string `json:"features,omitempty"`

 }

@@ -25,7 +25,7 @@ const (

 	VersionPatch = 0

 	// VersionDev indicates development branch. Releases will be empty string.

-	VersionDev = "-rc5-dev"

+	VersionDev = "-rc6-dev"

 )

 // Version is the specification version that the package types support.