Merge pull request #3543 from thaJeztah/remove_the_experiment

remove "Experimental" client field from "docker version"
docker · Apr 20, 2022 · 0b78efe · 0b78efe
2 parents e7c0659 + bbc95c7
commit 0b78efe
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/cli/command/system/testdata/docker-client-version.golden b/cli/command/system/testdata/docker-client-version.golden
@@ -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:

diff --git a/cli/command/system/version.go b/cli/command/system/version.go
@@ -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
@@ -143,7 +141,6 @@ func runVersion(dockerCli command.Cli, opts *versionOptions) error {
 			BuildTime:         reformatDate(version.BuildTime),
 			Os:                runtime.GOOS,
 			Arch:              arch(),
-			Experimental:      true,
 			Context:           dockerCli.CurrentContext(),
 		},
 	}

diff --git a/cli/command/system/version_test.go b/cli/command/system/version_test.go
@@ -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{},
 	}

diff --git a/docs/deprecated.md b/docs/deprecated.md
@@ -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
 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
 
 **Deprecated in Release: v20.10**