Skip to content

Allow ECR Credential Helper to be disabled #1600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
petetomasik merged 4 commits into from
Sep 26, 2025
Merged

Allow ECR Credential Helper to be disabled #1600

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3de3fe
Allow ECR Credential Helper to be disabled
petetomasik Sep 23, 2025
91e58fc
Allow pipeline overrides, set default env var
petetomasik Sep 23, 2025
68c4c09
Merge branch 'main' into SUP-4803-configurable-ecr-cred-helper
petetomasik Sep 25, 2025
7efd199
Merge branch 'main' into SUP-4803-configurable-ecr-cred-helper
petetomasik Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packer/linux/conf/buildkite-agent/hooks/environment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@ 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

# Allow pipeline-level override, otherwise use CloudFormation parameter
set_unless_present "BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER" "${ECR_CREDENTIAL_HELPER_ENABLED:-true}"

# map AWS_ECR_LOGIN_REGISTRY_IDS into the plugin list format
if [[ -n "${AWS_ECR_LOGIN_REGISTRY_IDS:-}" ]]; then
Expand Down
4 changes: 3 additions & 1 deletion packer/windows/conf/buildkite-agent/hooks/environment
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ 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

# Allow pipeline-level override, otherwise use CloudFormation parameter
set_unless_present "BUILDKITE_PLUGIN_ECR_CREDENTIAL_HELPER" "${ECR_CREDENTIAL_HELPER_ENABLED:-true}"

# map AWS_ECR_LOGIN_REGISTRY_IDS into the plugin list format
if [[ -n "${AWS_ECR_LOGIN_REGISTRY_IDS:-}" ]]; then
Expand Down
11 changes: 11 additions & 0 deletions templates/aws-stack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@ Metadata:
Parameters:
- EnableSecretsPlugin
- EnableECRPlugin
- EnableECRCredentialHelper
- EnableDockerLoginPlugin

Parameters:
Expand Down Expand Up @@ -848,6 +849,14 @@ Parameters:
- "false"
Default: "true"

EnableECRCredentialHelper:
Type: String
Description: Enable Amazon ECR Credential Helper in ECR plugin for Docker authentication.
AllowedValues:
- "true"
- "false"
Default: "true"

EnableDockerLoginPlugin:
Type: String
Description: Enables docker-login plugin for all pipelines.
Expand Down Expand Up @@ -1869,6 +1878,7 @@ Resources:
$Env:AWS_DEFAULT_REGION="${AWS::Region}"
$Env:SECRETS_PLUGIN_ENABLED="${EnableSecretsPlugin}"
$Env:ECR_PLUGIN_ENABLED="${EnableECRPlugin}"
$Env:ECR_CREDENTIAL_HELPER_ENABLED="${EnableECRCredentialHelper}"
$Env:DOCKER_LOGIN_PLUGIN_ENABLED="${EnableDockerLoginPlugin}"
$Env:AWS_REGION="${AWS::Region}"
$Env:ENABLE_EC2_LOG_RETENTION_POLICY="${EnableEC2LogRetentionPolicy}"
Expand Down Expand Up @@ -1962,6 +1972,7 @@ Resources:
AWS_DEFAULT_REGION="${AWS::Region}" \
SECRETS_PLUGIN_ENABLED="${EnableSecretsPlugin}" \
ECR_PLUGIN_ENABLED="${EnableECRPlugin}" \
ECR_CREDENTIAL_HELPER_ENABLED="${EnableECRCredentialHelper}" \
DOCKER_LOGIN_PLUGIN_ENABLED="${EnableDockerLoginPlugin}" \
DOCKER_EXPERIMENTAL="${EnableDockerExperimental}" \
DOCKER_USERNS_REMAP=${EnableDockerUserNamespaceRemap} \
Expand Down