Merge pull request #28647 from WeiZhang555/dont-lock-client-version

Bugfix: set cli.manualOverride when env var not empty
Upstream-commit: 51c107b64fbaefab671b5d69a03ec9a5860459ef
Component: engine

components/engine/client/client.go

@@ -122,7 +122,7 @@ func NewEnvClient() (*Client, error) {
 	if err != nil {
 		return cli, err
 	}
-	if version != "" {
+	if os.Getenv("DOCKER_API_VERSION") != "" {
 		cli.manualOverride = true
 	}
 	return cli, nil