Use docker 1.10 user namespacing

packer/buildkite-ami.json

@@ -20,11 +20,11 @@
     },
     {
       "type": "shell",
-      "script": "scripts/install-docker.sh"
+      "script": "scripts/install-buildkite.sh"
     },
     {
       "type": "shell",
-      "script": "scripts/install-buildkite.sh"
+      "script": "scripts/install-docker.sh"
     }
   ]
 }

packer/conf/docker.conf

@@ -2,4 +2,4 @@
 # running containers.  The default value of 1048576 mirrors the value
 # used by the systemd service unit.
 DAEMON_MAXFILES=1048576
-OPTIONS="--default-ulimit nofile=1024:4096 -s overlay"
+OPTIONS="--default-ulimit nofile=1024:4096 -s overlay --userns-remap=buildkite-agent"

packer/conf/subgid

@@ -0,0 +1 @@
+buildkite-agent:496:65536

packer/conf/subuid

@@ -0,0 +1 @@
+buildkite-agent:498:65536

packer/scripts/install-docker.sh

@@ -1,11 +1,17 @@
-#!/bin/bash -eu
+#!/bin/bash -eux
 
 sudo yum update -yq
 sudo yum install -yq docker
 sudo usermod -a -G docker ec2-user
 sudo cp /tmp/conf/docker.conf /etc/sysconfig/docker
+sudo cp /tmp/conf/subuid /etc/subuid
+sudo cp /tmp/conf/subgid /etc/subgid
 
-sudo service docker start
+# Overwrite the yum packaged docker with the latest
+sudo wget https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 -O /usr/bin/docker
+sudo chmod +x /usr/bin/docker
+
+sudo service docker start || ( cat /var/log/docker && false )
 sudo docker info
 
 # installs docker-compose
@@ -19,4 +25,4 @@ sudo chmod +x /etc/cron.hourly/docker-gc
 
 # install jq
 sudo curl -o /usr/bin/jq -L https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64
-sudo chmod +x /usr/bin/jq
+sudo chmod +x /usr/bin/jq