1. docker
  2. Commit db8991c9579795a1009fed7ac78eef0191fd881d
Browse code

Bugfix: set cli.manualOverride when env var not empty

If env var "DOCKER_API_VERSION" is specified by user, we'll set
`cli.manualOverride`, before this, this field is always true due to
wrong logic.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
(cherry picked from commit 4d54d30477f2eb0f373fd2301cf4c3ecc1434d62)
Signed-off-by: Victor Vieux <victorvieux@gmail.com>

Zhang Wei authored on 2016/11/21 18:31:46
Showing 1 changed files
client/client.go
History View file @ db8991c
... ... 
@@ -122,7 +122,7 @@ func NewEnvClient() (*Client, error) {
122 122 
 	if err != nil {
123 123 
 		return cli, err
124 124 
 	}
125 
-	if version != "" {
125 
+	if os.Getenv("DOCKER_API_VERSION") != "" {
126 126 
 		cli.manualOverride = true
127 127 
 	}
128 128 
 	return cli, nil