engine/dockerclient, app: Add new Docker version support and required…

… agent Capability New Docker client versions' agent capabilities to use the Capability prefix "ecs.capability"
aws · Sep 29, 2017 · 86a2f33 · 86a2f33
1 parent 62f3de1
commit 86a2f33
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/agent/app/agent_capability.go b/agent/app/agent_capability.go
@@ -53,6 +53,7 @@ const (
 //    ecs.capability.task-eni
 //    ecs.capability.task-eni-block-instance-metadata
 func (agent *ecsAgent) capabilities() []*ecs.Attribute {
+	dockerLegacyCapabilityPrefix := map[string]bool {"1.17": true, "1.18": true, "1.19": true, "1.20": true, "1.21": true, "1.22": true, "1.23": true, "1.24": true}
 	var capabilities []*ecs.Attribute
 
 	if !agent.cfg.PrivilegedDisabled {
@@ -63,7 +64,11 @@ func (agent *ecsAgent) capabilities() []*ecs.Attribute {
 	// Determine API versions to report as supported. Supported versions are also used for capability-enablement, except
 	// logging drivers.
 	for _, version := range agent.dockerClient.SupportedVersions() {
-		capabilities = appendNameOnlyAttribute(capabilities, capabilityPrefix+"docker-remote-api."+string(version))
+		if dockerLegacyCapabilityPrefix[string(version)] {
+			capabilities = appendNameOnlyAttribute(capabilities, capabilityPrefix+"docker-remote-api."+string(version))
+		} else {
+			capabilities = appendNameOnlyAttribute(capabilities, attributePrefix+"docker-remote-api."+string(version))
+		}
 		supportedVersions[version] = true
 	}
 

diff --git a/agent/engine/dockerclient/versionsupport_unix.go b/agent/engine/dockerclient/versionsupport_unix.go
@@ -34,6 +34,7 @@ func getAgentVersions() []DockerVersion {
 		Version_1_22,
 		Version_1_23,
 		Version_1_24,
+		Version_1_25,
 	}
 }