Merge pull request moby#47362 from thaJeztah/migrate_image_spec

migrate image spec to github.com/moby/docker-image-spec

api/types/container/config.go

@@ -5,8 +5,8 @@ import (
 	"time"
 
 	"github.com/docker/docker/api/types/strslice"
-	dockerspec "github.com/docker/docker/image/spec/specs-go/v1"
 	"github.com/docker/go-connections/nat"
+	dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
 )
 
 // MinimumDuration puts a minimum on user configured duration.

daemon/containerd/image.go

@@ -19,7 +19,7 @@ import (
 	"github.com/docker/docker/daemon/images"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
-	imagespec "github.com/docker/docker/image/spec/specs-go/v1"
+	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"

daemon/containerd/image_builder.go

@@ -27,14 +27,14 @@ import (
 	"github.com/docker/docker/builder"
 	"github.com/docker/docker/errdefs"
 	dimage "github.com/docker/docker/image"
-	imagespec "github.com/docker/docker/image/spec/specs-go/v1"
 	"github.com/docker/docker/internal/compatcontext"
 	"github.com/docker/docker/layer"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/progress"
 	"github.com/docker/docker/pkg/streamformatter"
 	"github.com/docker/docker/pkg/stringid"
 	registrypkg "github.com/docker/docker/registry"
+	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/identity"
 	"github.com/opencontainers/image-spec/specs-go"

daemon/containerd/image_commit.go

@@ -20,9 +20,9 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/docker/api/types/backend"
 	"github.com/docker/docker/image"
-	imagespec "github.com/docker/docker/image/spec/specs-go/v1"
 	"github.com/docker/docker/internal/compatcontext"
 	"github.com/docker/docker/pkg/archive"
+	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/identity"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/containerd/image_import.go

@@ -20,11 +20,11 @@ import (
 	"github.com/docker/docker/builder/dockerfile"
 	"github.com/docker/docker/errdefs"
 	"github.com/docker/docker/image"
-	imagespec "github.com/docker/docker/image/spec/specs-go/v1"
 	"github.com/docker/docker/internal/compatcontext"
 	"github.com/docker/docker/pkg/archive"
 	"github.com/docker/docker/pkg/pools"
 	"github.com/google/uuid"
+	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/specs-go"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"

daemon/containerd/imagespec.go

@@ -4,9 +4,9 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/dockerversion"
 	"github.com/docker/docker/image"
-	imagespec "github.com/docker/docker/image/spec/specs-go/v1"
 	"github.com/docker/docker/layer"
 	"github.com/docker/go-connections/nat"
+	imagespec "github.com/moby/docker-image-spec/specs-go/v1"
 	"github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )

image/spec/README.md

@@ -1,64 +1,4 @@
 # Docker Image Specification v1.
 
-This directory contains documents about Docker Image Specification v1.X.
-
-The Docker Image Specification is the image specification as used by the
-Docker Engine, and was used as foundation of the OCI image specification.
-
-The Docker Image Specification provides a superset of the OCI Image specification;
-it is OCI-compatible, but some extensions that are specific to the Docker
-Engine implementation.
-
-Refer to [spec.md](spec.md) for the current version of the Docker Image
-Specification, and the [OCI Image specification](https://github.com/opencontainers/image-spec/)
-for an in-depth specification of the OCI Image specs.
-
-The v1 file layout and manifests are no longer used in Moby and Docker, except in `docker save` and `docker load`.
-
-However, v1 Image JSON (`application/vnd.docker.container.image.v1+json`) has been still widely
-used and officially adopted in [V2 manifest](https://github.com/distribution/distribution/blob/main/docs/content/spec/manifest-v2-2.md)
-and in [OCI Image Format Specification](https://github.com/opencontainers/image-spec).
-
-## v1.X rough Changelog
-
-All 1.X versions are compatible with older ones.
-
-### [v1.3](spec.md)
-
-* Implemented in Docker v25.0
-
-Changes:
-
-* `StartInterval` was added to the `Healthcheck` struct in the Image JSON
-
-### [v1.2](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.2.md)
-
-* Implemented in Docker v1.12 (July, 2016)
-* The official spec document was written in August 2016 ([#25750](https://github.com/moby/moby/pull/25750))
-
-Changes:
-
-* `Healthcheck` struct was added to Image JSON
-
-### [v1.1](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.1.md)
-
-* Implemented in Docker v1.10 (February, 2016)
-* The official spec document was written in April 2016 ([#22264](https://github.com/moby/moby/pull/22264))
-
-Changes:
-
-* IDs were made into SHA256 digest values rather than random values
-* Layer directory names were made into deterministic values rather than random ID values
-* `manifest.json` was added 
-
-### [v1](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.md)
-
-* The initial revision
-* The official spec document was written in late 2014 ([#9560](https://github.com/moby/moby/pull/9560)), but actual implementations had existed even earlier
-
-
-## Related specifications
-
-* [Open Containers Initiative (OCI) Image Format Specification v1.0.0](https://github.com/opencontainers/image-spec/tree/v1.0.0)
-* [Docker Image Manifest Version 2, Schema 2](https://github.com/distribution/distribution/blob/main/docs/content/spec/manifest-v2-2.md)
-* [Docker Image Manifest Version 2, Schema 1](https://github.com/distribution/distribution/blob/main/docs/content/spec/deprecated-schema-v1.md) (*DEPRECATED*)
+This specification moved to a separate repository:
+https://github.com/moby/docker-image-spec