Merge branch 'master' into bump-agent-to-3.11.3

Author: Lachlan Donald

README.md

@@ -109,8 +109,8 @@ If you really want to store your secrets unencrypted, you can disable it entirel
 
 * [Amazon Linux 2 LTS](https://aws.amazon.com/amazon-linux-2/)
 * [Buildkite Agent v3.11.3](https://buildkite.com/docs/agent)
-* [Docker 18.09.1](https://www.docker.com)
-* [Docker Compose 1.23.2](https://docs.docker.com/compose/)
+* [Docker 18.09.5](https://www.docker.com)
+* [Docker Compose 1.24.0](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/linux/scripts/install-docker.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -eu -o pipefail
 
-DOCKER_VERSION=18.09.2
+DOCKER_VERSION=18.09.5
 DOCKER_RELEASE="stable"
-DOCKER_COMPOSE_VERSION=1.23.2
+DOCKER_COMPOSE_VERSION=1.24.0
 
 # This performs a manual install of Docker.
 

packer/windows/scripts/install-docker.ps1

@@ -1,7 +1,7 @@
 # Stop script execution when a non-terminating error occurs
 $ErrorActionPreference = "Stop"
 
-$docker_version="18.09.3"
+$docker_version="18.09.5"
 
 Write-Output "Upgrading DockerMsftProvider module"
 Update-Module -Name DockerMsftProvider -Force

templates/aws-stack.yml

@@ -721,7 +721,7 @@ Resources:
               powershell -file C:\buildkite-agent\bin\bk-configure-docker.ps1 >> C:\buildkite-agent\elastic-stack.log
 
               $Env:BUILDKITE_STACK_NAME="${AWS::StackName}"
-              $Env:BUILDKITE_STACK_VERSION="v4.3.1"
+              $Env:BUILDKITE_STACK_VERSION=%v
               $Env:BUILDKITE_LAMBDA_AUTOSCALING="${LambdaAutoscaling}"
               $Env:BUILDKITE_SCALE_IN_IDLE_PERIOD="${ScaleInIdlePeriod}"
               $Env:BUILDKITE_SECRETS_BUCKET="${LocalSecretsBucket}"