diff --git a/api/swagger.yaml b/api/swagger.yaml index d8e1157620..7d8629348c 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -1713,10 +1713,6 @@ definitions: example: - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6" - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" - BaseLayer: - type: "string" - x-nullable: true - example: "" Metadata: description: | Additional metadata of the image in the local cache. This information diff --git a/api/types/types.go b/api/types/types.go index eb5dfcd5ae..e52be89a93 100644 --- a/api/types/types.go +++ b/api/types/types.go @@ -19,9 +19,8 @@ import ( // RootFS returns Image's RootFS description including the layer IDs. type RootFS struct { - Type string - Layers []string `json:",omitempty"` - BaseLayer string `json:",omitempty"` + Type string `json:",omitempty"` + Layers []string `json:",omitempty"` } // ImageInspect contains response of Engine API: diff --git a/docs/api/v1.25.yaml b/docs/api/v1.25.yaml index 761a1db00c..4c01f7f761 100644 --- a/docs/api/v1.25.yaml +++ b/docs/api/v1.25.yaml @@ -889,8 +889,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" ImageSummary: type: "object" diff --git a/docs/api/v1.26.yaml b/docs/api/v1.26.yaml index 30f41303c5..780f49f6e2 100644 --- a/docs/api/v1.26.yaml +++ b/docs/api/v1.26.yaml @@ -890,8 +890,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" ImageSummary: type: "object" diff --git a/docs/api/v1.27.yaml b/docs/api/v1.27.yaml index e94601b0c8..a86839f81d 100644 --- a/docs/api/v1.27.yaml +++ b/docs/api/v1.27.yaml @@ -896,8 +896,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" ImageSummary: type: "object" diff --git a/docs/api/v1.28.yaml b/docs/api/v1.28.yaml index 13269c4097..96fcfad469 100644 --- a/docs/api/v1.28.yaml +++ b/docs/api/v1.28.yaml @@ -935,8 +935,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" ImageSummary: type: "object" diff --git a/docs/api/v1.29.yaml b/docs/api/v1.29.yaml index 4a3472eedc..b3ac51cc29 100644 --- a/docs/api/v1.29.yaml +++ b/docs/api/v1.29.yaml @@ -942,8 +942,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" ImageSummary: type: "object" diff --git a/docs/api/v1.30.yaml b/docs/api/v1.30.yaml index 3d9a8a84cb..b215b061ba 100644 --- a/docs/api/v1.30.yaml +++ b/docs/api/v1.30.yaml @@ -945,8 +945,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" ImageSummary: type: "object" diff --git a/docs/api/v1.31.yaml b/docs/api/v1.31.yaml index c93b48587c..28e7b8e8ca 100644 --- a/docs/api/v1.31.yaml +++ b/docs/api/v1.31.yaml @@ -946,8 +946,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.32.yaml b/docs/api/v1.32.yaml index 8ef48690ca..470de3c616 100644 --- a/docs/api/v1.32.yaml +++ b/docs/api/v1.32.yaml @@ -1204,8 +1204,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.33.yaml b/docs/api/v1.33.yaml index 58f40084bc..09f72d7597 100644 --- a/docs/api/v1.33.yaml +++ b/docs/api/v1.33.yaml @@ -1209,8 +1209,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.34.yaml b/docs/api/v1.34.yaml index bc21bc8728..782941c001 100644 --- a/docs/api/v1.34.yaml +++ b/docs/api/v1.34.yaml @@ -1220,8 +1220,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.35.yaml b/docs/api/v1.35.yaml index 82682ad74e..2043e3fd79 100644 --- a/docs/api/v1.35.yaml +++ b/docs/api/v1.35.yaml @@ -1196,8 +1196,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.36.yaml b/docs/api/v1.36.yaml index 1d80b34316..d0f7a7f4e1 100644 --- a/docs/api/v1.36.yaml +++ b/docs/api/v1.36.yaml @@ -1196,8 +1196,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.37.yaml b/docs/api/v1.37.yaml index bacfad5852..c723691f91 100644 --- a/docs/api/v1.37.yaml +++ b/docs/api/v1.37.yaml @@ -1199,8 +1199,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.38.yaml b/docs/api/v1.38.yaml index 3c89c9840f..ce2fd326f3 100644 --- a/docs/api/v1.38.yaml +++ b/docs/api/v1.38.yaml @@ -1210,8 +1210,6 @@ definitions: type: "array" items: type: "string" - BaseLayer: - type: "string" Metadata: type: "object" properties: diff --git a/docs/api/v1.39.yaml b/docs/api/v1.39.yaml index efddf3937d..1c1b917dc8 100644 --- a/docs/api/v1.39.yaml +++ b/docs/api/v1.39.yaml @@ -1620,10 +1620,6 @@ definitions: example: - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6" - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" - BaseLayer: - type: "string" - x-nullable: true - example: "" Metadata: description: | Additional metadata of the image in the local cache. This information diff --git a/docs/api/v1.40.yaml b/docs/api/v1.40.yaml index fbcbb98836..3650465149 100644 --- a/docs/api/v1.40.yaml +++ b/docs/api/v1.40.yaml @@ -1681,10 +1681,6 @@ definitions: example: - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6" - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" - BaseLayer: - type: "string" - x-nullable: true - example: "" Metadata: description: | Additional metadata of the image in the local cache. This information diff --git a/docs/api/v1.41.yaml b/docs/api/v1.41.yaml index 33f8b1491d..b964efebc1 100644 --- a/docs/api/v1.41.yaml +++ b/docs/api/v1.41.yaml @@ -1713,10 +1713,6 @@ definitions: example: - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6" - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef" - BaseLayer: - type: "string" - x-nullable: true - example: "" Metadata: description: | Additional metadata of the image in the local cache. This information diff --git a/docs/api/version-history.md b/docs/api/version-history.md index 0a8041812a..4e7f89d2d8 100644 --- a/docs/api/version-history.md +++ b/docs/api/version-history.md @@ -384,6 +384,10 @@ keywords: "API, Docker, rcli, REST, documentation" * `GET /version` now returns `MinAPIVersion`. * `POST /build` accepts `networkmode` parameter to specify network used during build. * `GET /images/(name)/json` now returns `OsVersion` if populated +* `GET /images/(name)/json` no longer contains the `RootFS.BaseLayer` field. This + field was used for Windows images that used a base-image that was pre-installed + on the host (`RootFS.Type` `layers+base`), which is no longer supported, and + the `RootFS.BaseLayer` field has been removed. * `GET /info` now returns `Isolation`. * `POST /containers/create` now takes `AutoRemove` in HostConfig, to enable auto-removal of the container on daemon side when the container's process exits. * `GET /containers/json` and `GET /containers/(id or name)/json` now return `"removing"` as a value for the `State.Status` field if the container is being removed. Previously, "exited" was returned as status.