Skip to content
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

oci-oras: fix for ORAS > 1.x, as it now requires HOME to be set (fixes download-artifact) #6976

Merged
merged 1 commit into from
Jul 21, 2024
Merged

oci-oras: fix for ORAS > 1.x, as it now requires HOME to be set (fixes download-artifact) #6976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 4 additions & 2 deletions lib/functions/general/oci-oras.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,11 @@ function run_tool_oras() {
fi

# Run oras, possibly with retries...
declare ORAS_HOME="${HOME:-"${TMPDIR}"}" # oras _requires_ a HOME to work atleast in 1.2+
display_alert "Running ORAS ${ACTUAL_VERSION}" "HOME='${ORAS_HOME}'; retries='${retries:-1}'; cmdline: $*" "debug"
if [[ "${retries:-1}" -gt 1 ]]; then
display_alert "Calling ORAS with retries ${retries}" "$*" "debug"
sleep_seconds="30" do_with_retries "${retries}" "${ORAS_BIN}" "$@"
sleep_seconds="30" do_with_retries "${retries}" env -i "HOME=${ORAS_HOME}" "${ORAS_BIN}" "$@"
else
# If any parameters passed, call ORAS, otherwise exit. We call it this way (sans-parameters) early to prepare ORAS tooling.
if [[ $# -eq 0 ]]; then
Expand All @@ -92,7 +94,7 @@ function run_tool_oras() {
fi

display_alert "Calling ORAS" "$*" "debug"
"${ORAS_BIN}" "$@"
env -i "HOME=${ORAS_HOME}" "${ORAS_BIN}" "$@"
fi
}

Expand Down