Skip to content

fix: Add retry logic to ACR login in on-demand sync script #220

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
janboll merged 4 commits into from
Apr 16, 2026
Merged

fix: Add retry logic to ACR login in on-demand sync script #220

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3679f28
Add retry logic to ACR login in on-demand sync script
raelga Apr 16, 2026
784aabd
Handle az acr login failure in copyImageFromOciLayout retry
raelga Apr 16, 2026
b63d3bf
Address review: use stderr for error/retry messages, rename wait vari…
raelga Apr 16, 2026
c29d7f0
Update pipelines/types/on-demand.sh
janboll Apr 16, 2026
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
41 changes: 33 additions & 8 deletions pipelines/types/on-demand.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,22 @@

set -euo pipefail

retry() {
local retries="${1}"
shift
local count=0
until "$@"; do
count=$((count + 1))
if [[ "${count}" -ge "${retries}" ]]; then
echo "Command failed after ${retries} attempts: $*" >&2
return 1
fi
local delay=$((2 ** count))
echo "Command failed (attempt ${count}/${retries}). Retrying in ${delay}s..." >&2
sleep "${delay}"
done
}

copyImageFromRegistry() {
# shortcut mirroring if the source registry is the same as the target ACR
REQUIRED_REGISTRY_VARS=("TARGET_ACR" "SOURCE_REGISTRY")
Expand Down Expand Up @@ -57,12 +73,15 @@ copyImageFromRegistry() {

# ACR login to target registry
echo "Logging into target ACR ${TARGET_ACR}."
if output="$( az acr login --name "${TARGET_ACR}" --expose-token --only-show-errors --output json 2>&1 )"; then
RESPONSE="${output}"
else
echo "Failed to log in to ACR ${TARGET_ACR}: ${output}"
exit 1
fi
acr_login_target() {
if output="$( az acr login --name "${TARGET_ACR}" --expose-token --only-show-errors --output json 2>&1 )"; then
RESPONSE="${output}"
else
echo "Failed to log in to ACR ${TARGET_ACR}: ${output}" >&2
return 1
fi
}
retry 5 acr_login_target
TARGET_ACR_LOGIN_SERVER="$(jq --raw-output .loginServer <<<"${RESPONSE}" )"
oras login --registry-config "${AUTH_JSON}" \
--username 00000000-0000-0000-0000-000000000000 \
Expand Down Expand Up @@ -135,8 +154,14 @@ copyImageFromOciLayout() {

echo "Getting the ACR access token."
USERNAME="00000000-0000-0000-0000-000000000000"
PASSWORD=$(az acr login --name "$TARGET_ACR" --expose-token --output tsv --query accessToken)

acr_login_oci() {
if ! PASSWORD=$(az acr login --name "$TARGET_ACR" --expose-token --only-show-errors --output tsv --query accessToken); then
echo "Failed to get ACR access token for ${TARGET_ACR}" >&2
return 1
fi
}
retry 5 acr_login_oci

echo "Logging in with ORAS."
oras login $TARGET_ACR_LOGIN_SERVER --username $USERNAME --password-stdin <<< $PASSWORD

Expand Down
Loading