From 3d72963ab8fd43aab4e4387867f1b9ae99e61262 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 19 Mar 2019 22:12:08 +0100 Subject: [PATCH] Fix client version not being pinned when set Signed-off-by: Sebastiaan van Stijn --- client/options.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/options.go b/client/options.go index 12eb25b18e..089be0d50d 100644 --- a/client/options.go +++ b/client/options.go @@ -45,8 +45,9 @@ func FromEnv(c *Client) error { } if version := os.Getenv("DOCKER_API_VERSION"); version != "" { - c.version = version - c.manualOverride = true + if err := WithVersion(version)(c); err != nil { + return err + } } return nil } @@ -139,6 +140,7 @@ func WithTLSClientConfig(cacertPath, certPath, keyPath string) func(*Client) err func WithVersion(version string) func(*Client) error { return func(c *Client) error { c.version = version + c.manualOverride = true return nil } }