Skip to content

Commit 3854195

Browse files
committed
Enable experimental docker cli in the environment hook
1 parent 0eef5d8 commit 3854195

File tree

5 files changed

+13
-0
lines changed

5 files changed

+13
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ set_always "BUILDKITE_ECR_POLICY" "${BUILDKITE_ECR_POLICY:-none}"
8484
set_always "BUILDKITE_SECRETS_BUCKET" "$BUILDKITE_SECRETS_BUCKET"
8585
set_always "BUILDKITE_STACK_NAME" "$BUILDKITE_STACK_NAME"
8686
set_always "BUILDKITE_STACK_VERSION" "$BUILDKITE_STACK_VERSION"
87+
set_always "BUILDKITE_DOCKER_EXPERIMENTAL" "$DOCKER_EXPERIMENTAL"
8788
set_always "DOCKER_VERSION" "$DOCKER_VERSION"
8889
set_always "PLUGINS_ENABLED" "${PLUGINS_ENABLED[*]-}"
8990
set_unless_present "AWS_DEFAULT_REGION" "$AWS_REGION"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY=$(mktemp -d)
1010
export BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY
1111
export DOCKER_CONFIG="$BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY"
1212

13+
if [ "${BUILDKITE_DOCKER_EXPERIMENTAL:-false}" = "true" ]
14+
then
15+
cat <<< "$(jq '.experimental="enabled"' "${DOCKER_CONFIG}/config.json")" > "${DOCKER_CONFIG}/config.json"
16+
fi
17+
1318
echo "~~~ :llama: Setting up elastic stack environment ($BUILDKITE_STACK_VERSION)"
1419

1520
echo "Checking docker"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ set_always "BUILDKITE_ECR_POLICY" "$Env:BUILDKITE_ECR_POLICY"
7676
set_always "BUILDKITE_SECRETS_BUCKET" "$Env:BUILDKITE_SECRETS_BUCKET"
7777
set_always "BUILDKITE_STACK_NAME" "$Env:BUILDKITE_STACK_NAME"
7878
set_always "BUILDKITE_STACK_VERSION" "$Env:BUILDKITE_STACK_VERSION"
79+
set_always "BUILDKITE_DOCKER_EXPERIMENTAL" "$DOCKER_EXPERIMENTAL"
7980
set_always "DOCKER_VERSION" "$DOCKER_VERSION"
8081
set_always "PLUGINS_ENABLED" "$PLUGINS_ENABLED"
8182
set_unless_present "AWS_DEFAULT_REGION" "$Env:AWS_REGION"

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY=$(mktemp -d)
1010
export BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY
1111
export DOCKER_CONFIG="$BUILDKITE_DOCKER_CONFIG_TEMP_DIRECTORY"
1212

13+
if [ "${BUILDKITE_DOCKER_EXPERIMENTAL:-false}" = "true" ]
14+
then
15+
cat <<< "$(jq '.experimental="enabled"' "${DOCKER_CONFIG}/config.json")" > "${DOCKER_CONFIG}/config.json"
16+
fi
17+
1318
echo "~~~ :llama: Setting up elastic stack environment ($BUILDKITE_STACK_VERSION)"
1419

1520
echo "Configuring built-in plugins"

templates/aws-stack.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -979,6 +979,7 @@ Resources:
979979
SECRETS_PLUGIN_ENABLED=${EnableSecretsPlugin} \
980980
ECR_PLUGIN_ENABLED=${EnableECRPlugin} \
981981
DOCKER_LOGIN_PLUGIN_ENABLED=${EnableDockerLoginPlugin} \
982+
DOCKER_EXPERIMENTAL=${EnableDockerExperimental} \
982983
AWS_REGION=${AWS::Region} \
983984
/usr/local/bin/bk-install-elastic-stack.sh
984985
--==BOUNDARY==--

0 commit comments

Comments
 (0)