Skip to content

Commit 03a17a2

Browse files
thaJeztahthaJeztah
committed
migrate image spec to github.com/moby/docker-image-spec
The specification was migrated to a separate module: https://github.com/moby/docker-image-spec Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 97478c9 commit 03a17a2

19 files changed

Lines changed: 268 additions & 841 deletions

File tree

‎api/types/container/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"time"
66

77
"github.com/docker/docker/api/types/strslice"
8-
dockerspec "github.com/docker/docker/image/spec/specs-go/v1"
98
"github.com/docker/go-connections/nat"
9+
dockerspec "github.com/moby/docker-image-spec/specs-go/v1"
1010
)
1111

1212
// MinimumDuration puts a minimum on user configured duration.

‎daemon/containerd/image.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/docker/docker/daemon/images"
2020
"github.com/docker/docker/errdefs"
2121
"github.com/docker/docker/image"
22-
imagespec "github.com/docker/docker/image/spec/specs-go/v1"
22+
imagespec "github.com/moby/docker-image-spec/specs-go/v1"
2323
"github.com/opencontainers/go-digest"
2424
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
2525
"github.com/pkg/errors"

‎daemon/containerd/image_builder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ import (
2727
"github.com/docker/docker/builder"
2828
"github.com/docker/docker/errdefs"
2929
dimage "github.com/docker/docker/image"
30-
imagespec "github.com/docker/docker/image/spec/specs-go/v1"
3130
"github.com/docker/docker/internal/compatcontext"
3231
"github.com/docker/docker/layer"
3332
"github.com/docker/docker/pkg/archive"
3433
"github.com/docker/docker/pkg/progress"
3534
"github.com/docker/docker/pkg/streamformatter"
3635
"github.com/docker/docker/pkg/stringid"
3736
registrypkg "github.com/docker/docker/registry"
37+
imagespec "github.com/moby/docker-image-spec/specs-go/v1"
3838
"github.com/opencontainers/go-digest"
3939
"github.com/opencontainers/image-spec/identity"
4040
"github.com/opencontainers/image-spec/specs-go"

‎daemon/containerd/image_commit.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import (
2020
"github.com/containerd/log"
2121
"github.com/docker/docker/api/types/backend"
2222
"github.com/docker/docker/image"
23-
imagespec "github.com/docker/docker/image/spec/specs-go/v1"
2423
"github.com/docker/docker/internal/compatcontext"
2524
"github.com/docker/docker/pkg/archive"
25+
imagespec "github.com/moby/docker-image-spec/specs-go/v1"
2626
"github.com/opencontainers/go-digest"
2727
"github.com/opencontainers/image-spec/identity"
2828
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎daemon/containerd/image_import.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import (
2020
"github.com/docker/docker/builder/dockerfile"
2121
"github.com/docker/docker/errdefs"
2222
"github.com/docker/docker/image"
23-
imagespec "github.com/docker/docker/image/spec/specs-go/v1"
2423
"github.com/docker/docker/internal/compatcontext"
2524
"github.com/docker/docker/pkg/archive"
2625
"github.com/docker/docker/pkg/pools"
2726
"github.com/google/uuid"
27+
imagespec "github.com/moby/docker-image-spec/specs-go/v1"
2828
"github.com/opencontainers/go-digest"
2929
"github.com/opencontainers/image-spec/specs-go"
3030
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

‎daemon/containerd/imagespec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"github.com/docker/docker/api/types/container"
55
"github.com/docker/docker/dockerversion"
66
"github.com/docker/docker/image"
7-
imagespec "github.com/docker/docker/image/spec/specs-go/v1"
87
"github.com/docker/docker/layer"
98
"github.com/docker/go-connections/nat"
9+
imagespec "github.com/moby/docker-image-spec/specs-go/v1"
1010
"github.com/opencontainers/go-digest"
1111
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
1212
)

‎image/spec/README.md‎

Lines changed: 2 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,4 @@
11
# Docker Image Specification v1.
22

3-
This directory contains documents about Docker Image Specification v1.X.
4-
5-
The Docker Image Specification is the image specification as used by the
6-
Docker Engine, and was used as foundation of the OCI image specification.
7-
8-
The Docker Image Specification provides a superset of the OCI Image specification;
9-
it is OCI-compatible, but some extensions that are specific to the Docker
10-
Engine implementation.
11-
12-
Refer to [spec.md](spec.md) for the current version of the Docker Image
13-
Specification, and the [OCI Image specification](https://github.com/opencontainers/image-spec/)
14-
for an in-depth specification of the OCI Image specs.
15-
16-
The v1 file layout and manifests are no longer used in Moby and Docker, except in `docker save` and `docker load`.
17-
18-
However, v1 Image JSON (`application/vnd.docker.container.image.v1+json`) has been still widely
19-
used and officially adopted in [V2 manifest](https://github.com/distribution/distribution/blob/main/docs/content/spec/manifest-v2-2.md)
20-
and in [OCI Image Format Specification](https://github.com/opencontainers/image-spec).
21-
22-
## v1.X rough Changelog
23-
24-
All 1.X versions are compatible with older ones.
25-
26-
### [v1.3](spec.md)
27-
28-
* Implemented in Docker v25.0
29-
30-
Changes:
31-
32-
* `StartInterval` was added to the `Healthcheck` struct in the Image JSON
33-
34-
### [v1.2](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.2.md)
35-
36-
* Implemented in Docker v1.12 (July, 2016)
37-
* The official spec document was written in August 2016 ([#25750](https://github.com/moby/moby/pull/25750))
38-
39-
Changes:
40-
41-
* `Healthcheck` struct was added to Image JSON
42-
43-
### [v1.1](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.1.md)
44-
45-
* Implemented in Docker v1.10 (February, 2016)
46-
* The official spec document was written in April 2016 ([#22264](https://github.com/moby/moby/pull/22264))
47-
48-
Changes:
49-
50-
* IDs were made into SHA256 digest values rather than random values
51-
* Layer directory names were made into deterministic values rather than random ID values
52-
* `manifest.json` was added
53-
54-
### [v1](https://github.com/moby/moby/blob/daa4618da826fb1de4fc2478d88196edbba49b2f/image/spec/v1.md)
55-
56-
* The initial revision
57-
* The official spec document was written in late 2014 ([#9560](https://github.com/moby/moby/pull/9560)), but actual implementations had existed even earlier
58-
59-
60-
## Related specifications
61-
62-
* [Open Containers Initiative (OCI) Image Format Specification v1.0.0](https://github.com/opencontainers/image-spec/tree/v1.0.0)
63-
* [Docker Image Manifest Version 2, Schema 2](https://github.com/distribution/distribution/blob/main/docs/content/spec/manifest-v2-2.md)
64-
* [Docker Image Manifest Version 2, Schema 1](https://github.com/distribution/distribution/blob/main/docs/content/spec/deprecated-schema-v1.md) (*DEPRECATED*)
3+
This specification moved to a separate repository:
4+
https://github.com/moby/docker-image-spec

0 commit comments

Comments
 (0)