Browse Source

Merge pull request #33888 from thaJeztah/enable-version-negotiation

Always perform version-negotiation
Victor Vieux 8 years ago
parent
commit
75a034621d
1 changed files with 7 additions and 2 deletions
  1. 7 2
      client/client.go

+ 7 - 2
client/client.go

@@ -260,8 +260,13 @@ func (cli *Client) NegotiateAPIVersionPing(p types.Ping) {
 		p.APIVersion = "1.24"
 	}
 
-	// if server version is lower than the current cli, downgrade
-	if versions.LessThan(p.APIVersion, cli.ClientVersion()) {
+	// if the client is not initialized with a version, start with the latest supported version
+	if cli.version == "" {
+		cli.version = api.DefaultVersion
+	}
+
+	// if server version is lower than the maximum version supported by the Client, downgrade
+	if versions.LessThan(p.APIVersion, api.DefaultVersion) {
 		cli.version = p.APIVersion
 	}
 }