Browse code

Fix client version not being pinned when set

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/03/20 06:12:08
Showing 1 changed files
... ...
@@ -45,8 +45,9 @@ func FromEnv(c *Client) error {
45 45
 	}
46 46
 
47 47
 	if version := os.Getenv("DOCKER_API_VERSION"); version != "" {
48
-		c.version = version
49
-		c.manualOverride = true
48
+		if err := WithVersion(version)(c); err != nil {
49
+			return err
50
+		}
50 51
 	}
51 52
 	return nil
52 53
 }
... ...
@@ -139,6 +140,7 @@ func WithTLSClientConfig(cacertPath, certPath, keyPath string) func(*Client) err
139 139
 func WithVersion(version string) func(*Client) error {
140 140
 	return func(c *Client) error {
141 141
 		c.version = version
142
+		c.manualOverride = true
142 143
 		return nil
143 144
 	}
144 145
 }