enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- it hasn't HOME when run under the matrix-prepare multiprocess launcher, so use TMPDIR
- fixes https://github.com/armbian/build/pull/6964
This commit is contained in:
Ricardo Pardini 2024-07-21 09:02:43 +02:00 committed by Igor
parent a6c1308e24
commit e4032228dd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/functions/general/oci-oras.sh
View File

@ -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
@ -92,7 +94,7 @@ function run_tool_oras() {
fi
display_alert "Calling ORAS" "$*" "debug"
"${ORAS_BIN}" "$@"
env -i "HOME=${ORAS_HOME}" "${ORAS_BIN}" "$@"
fi
}