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"

agent/app/agent_capability.go

@@ -14,6 +14,8 @@
 package app
 
 import (
+	"strconv"
+
 	"github.com/aws/amazon-ecs-agent/agent/ecs_client/model/ecs"
 	"github.com/aws/amazon-ecs-agent/agent/ecscni"
 	"github.com/aws/amazon-ecs-agent/agent/engine/dockerclient"
@@ -30,6 +32,7 @@ const (
 	taskENIAttributeSuffix                      = "task-eni"
 	taskENIBlockInstanceMetadataAttributeSuffix = "task-eni-block-instance-metadata"
 	cniPluginVersionSuffix                      = "cni-plugin-version"
+	dockerVersionUsingNewCapabilityPrefix	    = 1.25
 )
 
 // capabilities returns the supported capabilities of this agent / docker-client pair.
@@ -63,7 +66,12 @@ 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))
+		dockerVersion, _ := strconv.ParseFloat(string(version), 64)
+		if dockerVersion >= dockerVersionUsingNewCapabilityPrefix {
+			capabilities = appendNameOnlyAttribute(capabilities, attributePrefix+"docker-remote-api."+string(version))
+		} else {
+			capabilities = appendNameOnlyAttribute(capabilities, capabilityPrefix+"docker-remote-api."+string(version))
+		}
 		supportedVersions[version] = true
 	}
 

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,
 	}
 }