Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3543 from thaJeztah/remove_the_experiment 

remove "Experimental" client field from "docker version"
This commit is contained in:
Sebastiaan van Stijn 2022-04-20 22:03:21 +02:00 committed by GitHub
parent e7c0659ca6 bbc95c7bb7
commit 0b78efe8fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cli/command/system/testdata/docker-client-version.golden vendored
View File

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

3
cli/command/system/version.go
View File

@ -28,7 +28,6 @@ Client:{{if ne .Platform.Name ""}} {{.Platform.Name}}{{end}}
Built: {{.BuildTime}} Built: {{.BuildTime}}
OS/Arch: {{.Os}}/{{.Arch}} OS/Arch: {{.Os}}/{{.Arch}}
Context: {{.Context}} Context: {{.Context}}
Experimental: {{.Experimental}}
{{- end}} {{- end}}
{{- if .ServerOK}}{{with .Server}} {{- if .ServerOK}}{{with .Server}}
@ -76,7 +75,6 @@ type clientVersion struct {
Arch string Arch string
BuildTime string `json:",omitempty"` BuildTime string `json:",omitempty"`
Context string 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 // ServerOK returns true when the client could connect to the docker server
@ -143,7 +141,6 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
BuildTime: reformatDate(version.BuildTime), BuildTime: reformatDate(version.BuildTime),
Os: runtime.GOOS, Os: runtime.GOOS,
Arch: arch(), Arch: arch(),
Experimental: true,
Context: dockerCli.CurrentContext(), Context: dockerCli.CurrentContext(),
}, },
} }

1
cli/command/system/version_test.go
View File

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

4
docs/deprecated.md
View File

@ -345,6 +345,10 @@ The `DOCKER_CLI_EXPERIMENTAL` environment variable and the corresponding `experi
field in the CLI configuration file are deprecated. Experimental features are field in the CLI configuration file are deprecated. Experimental features are
enabled by default, and these configuration options are no longer functional. enabled by default, and these configuration options are no longer functional.
Starting with v22.04, the Docker CLI no longer prints `Experimental` for the client
in the output of `docker version`, and the field has been removed from the JSON
format.
### CLI plugins support ### CLI plugins support
**Deprecated in Release: v20.10** **Deprecated in Release: v20.10**