kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #38909 from thaJeztah/fix_version_override 

Fix client version not being pinned when set
This commit is contained in:
Tibor Vass 2019-03-21 14:14:39 -07:00 committed by GitHub
parent 6680a5cfe1 3d72963ab8
commit 6cce52c245
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/options.go
View File

@ -45,8 +45,9 @@ func FromEnv(c *Client) error {
} }
if version := os.Getenv("DOCKER_API_VERSION"); version != "" { if version := os.Getenv("DOCKER_API_VERSION"); version != "" {
c.version = version if err := WithVersion(version)(c); err != nil {
c.manualOverride = true return err
}
} }
return nil return nil
} }
@ -139,6 +140,7 @@ func WithTLSClientConfig(cacertPath, certPath, keyPath string) func(*Client) err
func WithVersion(version string) func(*Client) error { func WithVersion(version string) func(*Client) error {
return func(c *Client) error { return func(c *Client) error {
c.version = version c.version = version
c.manualOverride = true
return nil return nil
} }
} }