remove "Experimental" client field from "docker version"

Configuration (enabling/disabling) of Experimental client features
was deprecated in Docker 19.03, and removed in 20.10. Experimental
CLI features are now always enabled. In Docker 20.10, the Experimental
field in `docker version` was kept (but always true).

This patch removes the field from the output (both "pretty" output
and the JSON struct).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2022-04-07 22:14:25 +02:00
parent 5df36e51b9
commit bbc95c7bb7
4 changed files with 4 additions and 5 deletions

View File

@ -6,7 +6,6 @@ Client:
Built: Wed May 30 22:21:05 2018
OS/Arch: linux/amd64
Context: my-context
Experimental: true
Server: Docker Enterprise Edition (EE) 2.0
Engine:

View File

@ -28,7 +28,6 @@ Client:{{if ne .Platform.Name ""}} {{.Platform.Name}}{{end}}
Built: {{.BuildTime}}
OS/Arch: {{.Os}}/{{.Arch}}
Context: {{.Context}}
Experimental: {{.Experimental}}
{{- end}}
{{- if .ServerOK}}{{with .Server}}
@ -76,7 +75,6 @@ type clientVersion struct {
Arch string
BuildTime string `json:",omitempty"`
Context string
Experimental bool `json:",omitempty"` // Deprecated: experimental CLI features always enabled. This field is kept for backward-compatibility, and is always "true"
}
// ServerOK returns true when the client could connect to the docker server
@ -140,7 +138,6 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
BuildTime: reformatDate(version.BuildTime),
Os: runtime.GOOS,
Arch: arch(),
Experimental: true,
Context: dockerCli.CurrentContext(),
},
}

View File

@ -42,7 +42,6 @@ func TestVersionAlign(t *testing.T) {
Arch: "amd64",
BuildTime: "Wed May 30 22:21:05 2018",
Context: "my-context",
Experimental: true,
},
Server: &types.Version{},
}