Merge pull request #350 from buildkite/docker-17.09.0-ce

Docker 17.09.0-ce

Makefile

@@ -28,7 +28,7 @@ config.json:
 
 build-ami: config.json
 	docker run  -e AWS_DEFAULT_REGION  -e AWS_ACCESS_KEY_ID \
-		-e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN \
+		-e AWS_SECRET_ACCESS_KEY -e AWS_SESSION_TOKEN -e PACKER_LOG \
 		-v ${HOME}/.aws:/root/.aws \
 		--rm -v "$(PWD):/src" -w /src/packer hashicorp/packer:light \
 			build buildkite-ami.json | tee packer.output

README.md

@@ -107,8 +107,8 @@ If you really want to store your secrets unencrypted, you can disable it entirel
 
 * [Amazon Linux 2017.03.1](https://aws.amazon.com/amazon-linux-ami/)
 * [Buildkite Agent](https://buildkite.com/docs/agent)
-* [Docker 17.06.0-ce](https://www.docker.com)
-* [Docker Compose 1.14.0](https://docs.docker.com/compose/)
+* [Docker 17.09.0-ce](https://www.docker.com)
+* [Docker Compose 1.16.1](https://docs.docker.com/compose/)
 * [aws-cli](https://aws.amazon.com/cli/) - useful for performing any ops-related tasks
 * [jq](https://stedolan.github.io/jq/) - useful for manipulating JSON responses from cli tools such as aws-cli or the Buildkite API
 

packer/scripts/install-docker.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -eu -o pipefail
 
-DOCKER_VERSION=17.06.0-ce
-DOCKER_COMPOSE_VERSION=1.14.0
+DOCKER_VERSION=17.09.0-ce
+DOCKER_COMPOSE_VERSION=1.16.1
 
 # This performs a manual install of Docker. The init.d script is from the
 # 1.11 yum package