Update to support Agent 1.2.0 with Telemetry

Author: samuelkarp

ecs-init/config/common.go

@@ -70,7 +70,7 @@ func AgentTarball() string {
 
 // AgentRemoteTarball is the remote location of the Agent image, used for populating the cache
 func AgentRemoteTarball() string {
-	return "https://s3.amazonaws.com/" + s3Bucket + "/ecs-agent-v1.1.0.tar"
+	return "https://s3.amazonaws.com/" + s3Bucket + "/ecs-agent-v1.2.0.tar"
 }
 
 // AgentRemoteTarballMD5 is the remote location of a md5sum used to verify the integrity of the AgentRemoteTarball
@@ -82,3 +82,11 @@ func AgentRemoteTarballMD5() string {
 func DesiredImageLocatorFile() string {
 	return CacheDirectory() + "/desired-image"
 }
+
+func CgroupDirectory() string {
+	return "/cgroup"
+}
+
+func ExecDriverDirectory() string {
+	return "/var/run/docker/execdriver"
+}

ecs-init/docker/docker.go

@@ -27,6 +27,8 @@ const (
 	agentIntrospectionPort = "51678"
 	logDir                 = "/log"
 	dataDir                = "/data"
+	execDriverDir          = "/var/lib/docker/execdriver"
+	readOnly               = ":ro"
 )
 
 // Client enables business logic for running the Agent inside Docker
@@ -164,6 +166,8 @@ func (c *Client) getHostConfig() *godocker.HostConfig {
 		config.AgentDataDirectory() + ":" + dataDir,
 		config.AgentConfigDirectory() + ":" + config.AgentConfigDirectory(),
 		config.CacheDirectory() + ":" + config.CacheDirectory(),
+		config.CgroupDirectory() + ":" + config.CgroupDirectory() + readOnly,
+		config.ExecDriverDirectory() + ":" + execDriverDir + readOnly,
 	}
 	portBindings := map[godocker.Port][]godocker.PortBinding{
 		agentIntrospectionPort + "/tcp": []godocker.PortBinding{

ecs-init/docker/docker_test.go

@@ -236,8 +236,8 @@ func validateCommonCreateContainerOptions(opts godocker.CreateContainerOptions,
 
 	hostCfg := opts.HostConfig
 
-	if len(hostCfg.Binds) != 5 {
-		t.Errorf("Expected exactly 5 elements to be in Binds, but was %d", len(hostCfg.Binds))
+	if len(hostCfg.Binds) != 7 {
+		t.Errorf("Expected exactly 7 elements to be in Binds, but was %d", len(hostCfg.Binds))
 	}
 	binds := make(map[string]struct{})
 	for _, binding := range hostCfg.Binds {
@@ -248,6 +248,8 @@ func validateCommonCreateContainerOptions(opts godocker.CreateContainerOptions,
 	expectKey(config.AgentDataDirectory()+":/data", binds, t)
 	expectKey(config.AgentConfigDirectory()+":"+config.AgentConfigDirectory(), binds, t)
 	expectKey(config.CacheDirectory()+":"+config.CacheDirectory(), binds, t)
+	expectKey(config.CgroupDirectory()+":"+config.CgroupDirectory()+":ro", binds, t)
+	expectKey(config.ExecDriverDirectory()+":/var/lib/docker/execdriver:ro", binds, t)
 
 	if len(hostCfg.PortBindings) != 1 {
 		t.Errorf("Expected exactly 1 element to be in PortBindings, but was %d", len(hostCfg.PortBindings))

packaging/amazon-linux-ami/ecs-init.spec

@@ -13,8 +13,8 @@
 # limitations under the License.
 
 Name:           ecs-init
-Version:        1.0
-Release:        5%{?dist}
+Version:        1.2.0
+Release:        1%{?dist}
 Group:          System Environment/Base
 Vendor:         Amazon.com
 License:        Apache 2.0
@@ -27,9 +27,9 @@ Source1:        ecs.conf
 
 BuildRequires:  golang
 
-Requires:       docker > 1.5.0, docker <= 1.6.2
+Requires:       docker >= 1.6.0, docker <= 1.6.2
 Requires:       upstart
-Requires(post): docker > 1.5.0
+Requires(post): docker >= 1.6.0
 
 %global init_dir %{_sysconfdir}/init
 %global bin_dir %{_libexecdir}
@@ -132,6 +132,10 @@ if [ -e %{running_semaphore} ]; then
 fi
 
 %changelog
+* Tue Jun 6 2015 Samuel Karp <skarp@amazon.com> - 1.2.0-1
+- Update versioning scheme to match Agent version
+- Cache Agent version 1.2.0
+- Mount cgroup and execdriver directories for Telemetry feature
 * Mon Jun 1 2015 Samuel Karp <skarp@amazon.com> - 1.0-5
 - Add support for Docker 1.6.2
 * Mon May 11 2015 Samuel Karp <skarp@amazon.com> - 1.0-4