beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

api/image-inspect: Remove Container and ContainerConfig

Browse source 
Don't include these fields starting from API v1.45.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
This commit is contained in:
Paweł Gronowski 2024-02-22 17:07:26 +01:00
parent 825635a5bf
commit 03cddc62f4
No known key found for this signature in database
GPG key ID: B85EFCFE26DEF92A
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/server/router/image/image_routes.go
View file

@ -306,6 +306,10 @@ func (ir *imageRouter) getImagesByName(ctx context.Context, w http.ResponseWrite
imageInspect.Created = time.Time{}.Format(time.RFC3339Nano) imageInspect.Created = time.Time{}.Format(time.RFC3339Nano)
} }
} }
if versions.GreaterThanOrEqualTo(version, "1.45") {
imageInspect.Container = "" //nolint:staticcheck // ignore SA1019: field is deprecated, but still set on API < v1.45.
imageInspect.ContainerConfig = nil //nolint:staticcheck // ignore SA1019: field is deprecated, but still set on API < v1.45.
}
return httputils.WriteJSON(w, http.StatusOK, imageInspect) return httputils.WriteJSON(w, http.StatusOK, imageInspect)
} }

4
api/types/types.go
View file

@ -82,7 +82,7 @@ type ImageInspect struct {
// Depending on how the image was created, this field may be empty. // Depending on how the image was created, this field may be empty.
// //
// Deprecated: this field is omitted in API v1.45, but kept for backward compatibility. // Deprecated: this field is omitted in API v1.45, but kept for backward compatibility.
Container string Container string `json:",omitempty"`
// ContainerConfig is an optional field containing the configuration of the // ContainerConfig is an optional field containing the configuration of the
// container that was last committed when creating the image. // container that was last committed when creating the image.
@ -91,7 +91,7 @@ type ImageInspect struct {
// and it is not in active use anymore. // and it is not in active use anymore.
// //
// Deprecated: this field is omitted in API v1.45, but kept for backward compatibility. // Deprecated: this field is omitted in API v1.45, but kept for backward compatibility.
ContainerConfig *container.Config ContainerConfig *container.Config `json:",omitempty"`
// DockerVersion is the version of Docker that was used to build the image. // DockerVersion is the version of Docker that was used to build the image.
// //

3
docs/api/version-history.md
View file

@ -22,6 +22,9 @@ keywords: "API, Docker, rcli, REST, documentation"
* `POST /images/search` will always assume a `false` value for the `is-automated` * `POST /images/search` will always assume a `false` value for the `is-automated`
field. Consequently, searching for `is-automated=true` will yield no results, field. Consequently, searching for `is-automated=true` will yield no results,
while `is-automated=false` will be a no-op. while `is-automated=false` will be a no-op.
* `GET /images/{name}/json` no longer includes the `Container` and
`ContainerConfig` fields. To access image configuration, use `Config` field
instead.
## v1.44 API changes ## v1.44 API changes