Add more fields to ContainerConfig

SoManyHs · allisaurus · commit f81e43754db0 · 2018-06-04T10:55:48.000-07:00
These correspond to docker compose fields currently supported in V1/V2
diff --git a/ecs-cli/modules/cli/compose/containerconfig/containerconfig.go b/ecs-cli/modules/cli/compose/containerconfig/containerconfig.go
@@ -3,14 +3,15 @@ package containerconfig
 import "github.com/aws/aws-sdk-go/service/ecs"
 
 // ContainerConfig all compose fields supported by the ecs-cli
-// TODO: finalize fields
+// TODO: finalize fields (Note: Devices and HealthCheck not currently supported)
 type ContainerConfig struct {
 	Name string
 
-	CapAdd                []string
-	CapDrop               []string
-	Command               []string
-	Devices               []string
+	CapAdd  []string
+	CapDrop []string
+	Command []string
+	CPU     int64
+	// Devices            []string
 	DNSSearchDomains      []string
 	DNSServers            []string
 	DockerLabels          map[string]*string
@@ -19,14 +20,20 @@ type ContainerConfig struct {
 	Environment           []*ecs.KeyValuePair
 	ExtraHosts            []string
 	Hostname              string
-	HealthCheck           *ecs.HealthCheck
-	Image                 string
-	Links                 []string
-	LogConfiguration      *ecs.LogConfiguration
-	PortMappings          []*ecs.PortMapping
-	Privileged            bool
-	ReadOnly              bool
-	Tmpfs                 []string
-	User                  string
-	WorkingDirectory      string
+	// HealthCheck        *ecs.HealthCheck
+	Image             string
+	Links             []string
+	LogConfiguration  *ecs.LogConfiguration
+	Memory            int64
+	MemoryReservation int64
+	MountPoints       []*ecs.MountPoint
+	PortMappings      []*ecs.PortMapping
+	Privileged        bool
+	ReadOnly          bool
+	ShmSize           int64
+	Tmpfs             []string
+	Ulimits           []*ecs.Ulimit
+	VolumesFrom       []*ecs.VolumeFrom
+	User              string
+	WorkingDirectory  string
 }
diff --git a/ecs-cli/modules/utils/compose/convert_task_definition.go b/ecs-cli/modules/utils/compose/convert_task_definition.go
@@ -45,10 +45,36 @@ const (
 
 // supported fields/options from compose YAML file
 var supportedComposeYamlOptions = []string{
-	"cpu_shares", "command", "dns", "dns_search", "entrypoint", "env_file",
-	"environment", "extra_hosts", "hostname", "image", "labels", "links",
-	"logging", "log_driver", "log_opt", "mem_limit", "mem_reservation", "ports", "privileged", "read_only",
-	"security_opt", "ulimits", "user", "volumes", "volumes_from", "working_dir", "cap_add", "cap_drop", "shm_size", "tmpfs",
+	"cap_add",
+	"cap_drop",
+	"command",
+	"cpu_shares",
+	"dns",
+	"dns_search",
+	"entrypoint",
+	"env_file",
+	"environment",
+	"extra_hosts",
+	"hostname",
+	"image",
+	"labels",
+	"links",
+	"logging",
+	"log_driver", // v1 only
+	"log_opt",    // v1 only
+	"mem_limit",
+	"mem_reservation",
+	"ports",
+	"privileged",
+	"read_only",
+	"security_opt",
+	"shm_size",
+	"tmpfs",
+	"ulimits",
+	"user",
+	"volumes",
+	"volumes_from",
+	"working_dir",
 }
 
 var supportedComposeYamlOptionsMap = getSupportedComposeYamlOptionsMap()
