Merge pull request #911 from buildkite/keithduncan/enable-docker-cli-experimental

Enable experimental docker cli in the environment hook

Author: keithduncan

packer/linux/conf/bin/bk-install-elastic-stack.sh

@@ -84,6 +84,7 @@ set_always         "BUILDKITE_ECR_POLICY" "${BUILDKITE_ECR_POLICY:-none}"
 set_always         "BUILDKITE_SECRETS_BUCKET" "$BUILDKITE_SECRETS_BUCKET"
 set_always         "BUILDKITE_STACK_NAME" "$BUILDKITE_STACK_NAME"
 set_always         "BUILDKITE_STACK_VERSION" "$BUILDKITE_STACK_VERSION"
+set_always         "BUILDKITE_DOCKER_EXPERIMENTAL" "$DOCKER_EXPERIMENTAL"
 set_always         "DOCKER_VERSION" "$DOCKER_VERSION"
 set_always         "PLUGINS_ENABLED" "${PLUGINS_ENABLED[*]-}"
 set_unless_present "AWS_DEFAULT_REGION" "$AWS_REGION"

packer/linux/conf/buildkite-agent/hooks/environment

@@ -10,6 +10,12 @@ BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY=$(mktemp -d)
 export BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY
 export DOCKER_CONFIG="$BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY"
 
+if [ "${BUILDKITE_DOCKER_EXPERIMENTAL:-false}" = "true" ]
+then
+  #shellcheck disable=SC2094 # Redirections to the same command are processed in order
+  cat <<< "$(jq '.experimental="enabled"' "${DOCKER_CONFIG}/config.json")" > "${DOCKER_CONFIG}/config.json"
+fi
+
 echo "~~~ :llama: Setting up elastic stack environment ($BUILDKITE_STACK_VERSION)"
 
 echo "Checking docker"

packer/windows/conf/bin/bk-install-elastic-stack.ps1

@@ -76,6 +76,7 @@ set_always         "BUILDKITE_ECR_POLICY" "$Env:BUILDKITE_ECR_POLICY"
 set_always         "BUILDKITE_SECRETS_BUCKET" "$Env:BUILDKITE_SECRETS_BUCKET"
 set_always         "BUILDKITE_STACK_NAME" "$Env:BUILDKITE_STACK_NAME"
 set_always         "BUILDKITE_STACK_VERSION" "$Env:BUILDKITE_STACK_VERSION"
+set_always         "BUILDKITE_DOCKER_EXPERIMENTAL" "$DOCKER_EXPERIMENTAL"
 set_always         "DOCKER_VERSION" "$DOCKER_VERSION"
 set_always         "PLUGINS_ENABLED" "$PLUGINS_ENABLED"
 set_unless_present "AWS_DEFAULT_REGION" "$Env:AWS_REGION"

packer/windows/conf/buildkite-agent/hooks/environment

@@ -10,6 +10,12 @@ BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY=$(mktemp -d)
 export BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY
 export DOCKER_CONFIG="$BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY"
 
+if [ "${BUILDKITE_DOCKER_EXPERIMENTAL:-false}" = "true" ]
+then
+  #shellcheck disable=SC2094 # Redirections to the same command are processed in order
+  cat <<< "$(jq '.experimental="enabled"' "${DOCKER_CONFIG}/config.json")" > "${DOCKER_CONFIG}/config.json"
+fi
+
 echo "~~~ :llama: Setting up elastic stack environment ($BUILDKITE_STACK_VERSION)"
 
 echo "Configuring built-in plugins"

templates/aws-stack.yml

@@ -979,6 +979,7 @@ Resources:
                   SECRETS_PLUGIN_ENABLED=${EnableSecretsPlugin} \
                   ECR_PLUGIN_ENABLED=${EnableECRPlugin} \
                   DOCKER_LOGIN_PLUGIN_ENABLED=${EnableDockerLoginPlugin} \
+                  DOCKER_EXPERIMENTAL=${EnableDockerExperimental} \
                   AWS_REGION=${AWS::Region} \
                     /usr/local/bin/bk-install-elastic-stack.sh
                   --==BOUNDARY==--