@@ -416,13 +416,15 @@ func (i *ImageService) CreateImage(ctx context.Context, config []byte, parent st

 	// make an ocispec.Image from the docker/image.Image

 	ociImgToCreate := ocispec.Image{

-		Created:      &imgToCreate.Created,

-		Author:       imgToCreate.Author,

-		Architecture: imgToCreate.Architecture,

-		Variant:      imgToCreate.Variant,

-		OS:           imgToCreate.OS,

-		OSVersion:    imgToCreate.OSVersion,

-		OSFeatures:   imgToCreate.OSFeatures,

+		Created: &imgToCreate.Created,

+		Author:  imgToCreate.Author,

+		Platform: ocispec.Platform{

+			Architecture: imgToCreate.Architecture,

+			Variant:      imgToCreate.Variant,

+			OS:           imgToCreate.OS,

+			OSVersion:    imgToCreate.OSVersion,

+			OSFeatures:   imgToCreate.OSFeatures,

+		},

 		Config: ocispec.ImageConfig{

 			User:         imgToCreate.Config.User,

 			ExposedPorts: exposedPorts,

@@ -131,11 +131,13 @@ func generateCommitImageConfig(baseConfig ocispec.Image, diffID digest.Digest, o

 	}

 	logrus.Debugf("generateCommitImageConfig(): arch=%q, os=%q", arch, os)

 	return ocispec.Image{

-		Architecture: arch,

-		OS:           os,

-		Created:      &createdTime,

-		Author:       opts.Author,

-		Config:       containerConfigToOciImageConfig(opts.Config),

+		Platform: ocispec.Platform{

+			Architecture: arch,

+			OS:           os,

+		},

+		Created: &createdTime,

+		Author:  opts.Author,

+		Config:  containerConfigToOciImageConfig(opts.Config),

 		RootFS: ocispec.RootFS{

 			Type:    "layers",

 			DiffIDs: append(baseConfig.RootFS.DiffIDs, diffID),

@@ -86,11 +86,10 @@ func (i *ImageService) ImportImage(ctx context.Context, ref reference.Named, pla

 	ociCfg := containerConfigToOciImageConfig(imageConfig)

 	createdAt := time.Now()

 	config := ocispec.Image{

-		Architecture: platform.Architecture,

-		OS:           platform.OS,

-		Created:      &createdAt,

-		Author:       "",

-		Config:       ociCfg,

+		Platform: *platform,

+		Created:  &createdAt,

+		Author:   "",

+		Config:   ociCfg,

 		RootFS: ocispec.RootFS{

 			Type:    "layers",

 			DiffIDs: []digest.Digest{uncompressedDigest},

@@ -53,13 +53,10 @@ func createTestImage(ctx context.Context, t testing.TB, store content.Store) oci

 	layerDigest := w.Digest()

 	w.Close()

-	platform := platforms.DefaultSpec()

-

 	img := ocispec.Image{

-		Architecture: platform.Architecture,

-		OS:           platform.OS,

-		RootFS:       ocispec.RootFS{Type: "layers", DiffIDs: []digest.Digest{layerDigest}},

-		Config:       ocispec.ImageConfig{WorkingDir: "/"},

+		Platform: platforms.DefaultSpec(),

+		RootFS:   ocispec.RootFS{Type: "layers", DiffIDs: []digest.Digest{layerDigest}},

+		Config:   ocispec.ImageConfig{WorkingDir: "/"},

 	}

 	imgJSON, err := json.Marshal(img)

 	assert.NilError(t, err)

@@ -71,7 +71,7 @@ require (

 	github.com/moby/term v0.5.0

 	github.com/morikuni/aec v1.0.0

 	github.com/opencontainers/go-digest v1.0.0

-	github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b

+	github.com/opencontainers/image-spec v1.1.0-rc3

 	github.com/opencontainers/runc v1.1.7

 	github.com/opencontainers/runtime-spec v1.1.0-rc.2

 	github.com/opencontainers/selinux v1.11.0

@@ -1144,8 +1144,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8

 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=

 github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=

 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=

-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b h1:YWuSjZCQAPM8UUBLkYUk1e+rZcvWHJmFb6i6rM44Xs8=

-github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=

+github.com/opencontainers/image-spec v1.1.0-rc3 h1:fzg1mXZFj8YdPeNkRXMg+zb88BFV0Ys52cJydRwBkb8=

+github.com/opencontainers/image-spec v1.1.0-rc3/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8=

 github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=

 github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=

 github.com/opencontainers/runc v1.0.0-rc10/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=

@@ -65,7 +65,4 @@ const (

 	// AnnotationArtifactDescription is the annotation key for the human readable description for the artifact.

 	AnnotationArtifactDescription = "org.opencontainers.artifact.description"

-

-	// AnnotationReferrersFiltersApplied is the annotation key for the comma separated list of filters applied by the registry in the referrers listing.

-	AnnotationReferrersFiltersApplied = "org.opencontainers.referrers.filtersApplied"

 )

deleted file mode 100644

@@ -1,34 +0,0 @@

-// Copyright 2022 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

-

-// Artifact describes an artifact manifest.

-// This structure provides `application/vnd.oci.artifact.manifest.v1+json` mediatype when marshalled to JSON.

-type Artifact struct {

-	// MediaType is the media type of the object this schema refers to.

-	MediaType string `json:"mediaType"`

-

-	// ArtifactType is the IANA media type of the artifact this schema refers to.

-	ArtifactType string `json:"artifactType"`

-

-	// Blobs is a collection of blobs referenced by this manifest.

-	Blobs []Descriptor `json:"blobs,omitempty"`

-

-	// Subject (reference) is an optional link from the artifact to another manifest forming an association between the artifact and the other manifest.

-	Subject *Descriptor `json:"subject,omitempty"`

-

-	// Annotations contains arbitrary metadata for the artifact manifest.

-	Annotations map[string]string `json:"annotations,omitempty"`

-}

@@ -49,13 +49,15 @@ type ImageConfig struct {

 	// StopSignal contains the system call signal that will be sent to the container to exit.

 	StopSignal string `json:"StopSignal,omitempty"`

-	// ArgsEscaped `[Deprecated]` - This field is present only for legacy

-	// compatibility with Docker and should not be used by new image builders.

-	// It is used by Docker for Windows images to indicate that the `Entrypoint`

-	// or `Cmd` or both, contains only a single element array, that is a

-	// pre-escaped, and combined into a single string `CommandLine`. If `true`

-	// the value in `Entrypoint` or `Cmd` should be used as-is to avoid double

-	// escaping.

+	// ArgsEscaped

+	//

+	// Deprecated: This field is present only for legacy compatibility with

+	// Docker and should not be used by new image builders.  It is used by Docker

+	// for Windows images to indicate that the `Entrypoint` or `Cmd` or both,

+	// contains only a single element array, that is a pre-escaped, and combined

+	// into a single string `CommandLine`. If `true` the value in `Entrypoint` or

+	// `Cmd` should be used as-is to avoid double escaping.

+	// https://github.com/opencontainers/image-spec/pull/892

 	ArgsEscaped bool `json:"ArgsEscaped,omitempty"`

 }

@@ -95,22 +97,8 @@ type Image struct {

 	// Author defines the name and/or email address of the person or entity which created and is responsible for maintaining the image.

 	Author string `json:"author,omitempty"`

-	// Architecture is the CPU architecture which the binaries in this image are built to run on.

-	Architecture string `json:"architecture"`

-

-	// Variant is the variant of the specified CPU architecture which image binaries are intended to run on.

-	Variant string `json:"variant,omitempty"`

-

-	// OS is the name of the operating system which the image is built to run on.

-	OS string `json:"os"`

-

-	// OSVersion is an optional field specifying the operating system

-	// 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,

-	// each listing a required OS feature (for example on Windows `win32k`).

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

+	// Platform describes the platform which the image in the manifest runs on.

+	Platform

 	// Config defines the execution parameters which should be used as a base when running a container using the image.

 	Config ImageConfig `json:"config,omitempty"`

@@ -23,6 +23,9 @@ type Manifest struct {

 	// MediaType specifies the type of this document data structure e.g. `application/vnd.oci.image.manifest.v1+json`

 	MediaType string `json:"mediaType,omitempty"`

+	// ArtifactType specifies the IANA media type of artifact when the manifest is used for an artifact.

+	ArtifactType string `json:"artifactType,omitempty"`

+

 	// Config references a configuration object for a container, by digest.

 	// The referenced configuration object is a JSON blob that the runtime uses to set up the container.

 	Config Descriptor `json:"config"`

@@ -36,3 +39,11 @@ type Manifest struct {

 	// Annotations contains arbitrary metadata for the image manifest.

 	Annotations map[string]string `json:"annotations,omitempty"`

 }

+

+// ScratchDescriptor is the descriptor of a blob with content of `{}`.

+var ScratchDescriptor = Descriptor{

+	MediaType: MediaTypeScratch,

+	Digest:    `sha256:44136fa355b3678a1146ad16f7e8649e94fb4fc21fe77e8310c060f61caaff8a`,

+	Size:      2,

+	Data:      []byte(`{}`),

+}

@@ -40,21 +40,36 @@ const (

 	// MediaTypeImageLayerNonDistributable is the media type for layers referenced by

 	// the manifest but with distribution restrictions.

+	//

+	// Deprecated: Non-distributable layers are deprecated, and not recommended

+	// for future use. Implementations SHOULD NOT produce new non-distributable

+	// layers.

+	// https://github.com/opencontainers/image-spec/pull/965

 	MediaTypeImageLayerNonDistributable = "application/vnd.oci.image.layer.nondistributable.v1.tar"

 	// MediaTypeImageLayerNonDistributableGzip is the media type for

 	// gzipped layers referenced by the manifest but with distribution

 	// restrictions.

+	//

+	// Deprecated: Non-distributable layers are deprecated, and not recommended

+	// for future use. Implementations SHOULD NOT produce new non-distributable

+	// layers.

+	// https://github.com/opencontainers/image-spec/pull/965

 	MediaTypeImageLayerNonDistributableGzip = "application/vnd.oci.image.layer.nondistributable.v1.tar+gzip"

 	// MediaTypeImageLayerNonDistributableZstd is the media type for zstd

 	// compressed layers referenced by the manifest but with distribution

 	// restrictions.

+	//

+	// Deprecated: Non-distributable layers are deprecated, and not recommended

+	// for future use. Implementations SHOULD NOT produce new non-distributable

+	// layers.

+	// https://github.com/opencontainers/image-spec/pull/965

 	MediaTypeImageLayerNonDistributableZstd = "application/vnd.oci.image.layer.nondistributable.v1.tar+zstd"

 	// MediaTypeImageConfig specifies the media type for the image configuration.

 	MediaTypeImageConfig = "application/vnd.oci.image.config.v1+json"

-	// MediaTypeArtifactManifest specifies the media type for a content descriptor.

-	MediaTypeArtifactManifest = "application/vnd.oci.artifact.manifest.v1+json"

+	// MediaTypeScratch specifies the media type for an unused blob containing the value `{}`

+	MediaTypeScratch = "application/vnd.oci.scratch.v1+json"

 )

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

 	VersionPatch = 0

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

-	VersionDev = "-dev"

+	VersionDev = "-rc.3"

 )

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

@@ -841,8 +841,8 @@ github.com/morikuni/aec

 ## explicit; go 1.13

 github.com/opencontainers/go-digest

 github.com/opencontainers/go-digest/digestset

-# github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b

-## explicit; go 1.17

+# github.com/opencontainers/image-spec v1.1.0-rc3

+## explicit; go 1.18

 github.com/opencontainers/image-spec/identity

 github.com/opencontainers/image-spec/specs-go

 github.com/opencontainers/image-spec/specs-go/v1