Merge pull request #1565 from buildkite/SUP-4593-enable-ecr-credential-helper

Enable ECR Credential Helper, update plugins, PATH fix

Author: petetomasik

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

@@ -109,6 +109,7 @@ fi
 if [[ "${BUILDKITE_ECR_POLICY:-}" != "none" && "${ECR_PLUGIN_ENABLED:-}" == "1" ]]; then
   export BUILDKITE_PLUGIN_ECR_LOGIN=1
   export BUILDKITE_PLUGIN_ECR_RETRIES=3
+  export BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER=true
 
   # map AWS_ECR_LOGIN_REGISTRY_IDS into the plugin list format
   if [[ -n "${AWS_ECR_LOGIN_REGISTRY_IDS:-}" ]]; then

packer/linux/scripts/install-buildkite-utils.sh

@@ -15,7 +15,7 @@ echo "Installing fix-buildkite-agent-builds-permissions..."
 sudo chmod +x "/tmp/build/fix-perms-linux-${ARCH}"
 sudo mv "/tmp/build/fix-perms-linux-${ARCH}" /usr/bin/fix-buildkite-agent-builds-permissions
 
-S3_SECRETS_HELPER_VERSION=2.2.0
+S3_SECRETS_HELPER_VERSION=2.5.0
 echo "Downloading s3-secrets-helper ${S3_SECRETS_HELPER_VERSION}..."
 sudo curl -Lsf -o /usr/local/bin/s3secrets-helper \
   "https://github.com/buildkite/elastic-ci-stack-s3-secrets-hooks/releases/download/v${S3_SECRETS_HELPER_VERSION}/s3secrets-helper-linux-${ARCH}"

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

@@ -55,6 +55,7 @@ fi
 if [[ "${BUILDKITE_ECR_POLICY:-}" != "none" && "${ECR_PLUGIN_ENABLED:-}" == "1" ]]; then
   export BUILDKITE_PLUGIN_ECR_LOGIN=1
   export BUILDKITE_PLUGIN_ECR_RETRIES=3
+  export BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER=true
 
   # map AWS_ECR_LOGIN_REGISTRY_IDS into the plugin list format
   if [[ -n "${AWS_ECR_LOGIN_REGISTRY_IDS:-}" ]]; then

packer/windows/scripts/install-docker.ps1

@@ -18,3 +18,11 @@ $docker_plugins_dir = "${env:ProgramFiles}\Docker"
 New-Item -ItemType Directory -Force -Path $docker_plugins_dir | Out-Null
 Invoke-WebRequest -Uri $ecr_cred_helper_url -OutFile "$docker_plugins_dir\docker-credential-ecr-login.exe"
 Write-Output "Amazon ECR credential helper v$ecr_cred_helper_version installed to $docker_plugins_dir"
+
+Write-Output "Adding Docker plugins directory to system PATH..."
+$oldpath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path
+if ($oldpath -notlike "*$docker_plugins_dir*") {
+  $newpath = "$docker_plugins_dir;$oldpath"
+  Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value $newpath
+  Write-Output "Added $docker_plugins_dir to system PATH"
+}

packer/windows/scripts/install-s3secrets-helper.ps1

@@ -1,7 +1,7 @@
 # Stop script execution when a non-terminating error occurs
 $ErrorActionPreference = "Stop"
 
-$S3_SECRETS_HELPER_VERSION = "2.2.0"
+$S3_SECRETS_HELPER_VERSION = "2.5.0"
 
 Write-Output "Downloading s3-secrets-helper v${S3_SECRETS_HELPER_VERSION}..."
 Invoke-WebRequest -OutFile C:\buildkite-agent\bin\s3secrets-helper.exe -Uri "https://github.com/buildkite/elastic-ci-stack-s3-secrets-hooks/releases/download/v${S3_SECRETS_HELPER_VERSION}/s3secrets-helper-windows-amd64"