add retry to mod curls
rodzic
c7d664a0e6
commit
8c75b07d4e
|
@ -27,14 +27,14 @@ fi
|
||||||
# Use different filtering depending on URL
|
# Use different filtering depending on URL
|
||||||
get_blob_sha () {
|
get_blob_sha () {
|
||||||
if [[ $1 == "ghcr" ]]; then
|
if [[ $1 == "ghcr" ]]; then
|
||||||
curl \
|
curl -f --retry 10 --retry-max-time 60 --retry-connrefused \
|
||||||
--silent \
|
--silent \
|
||||||
--location \
|
--location \
|
||||||
--request GET \
|
--request GET \
|
||||||
--header "Authorization: Bearer $2" \
|
--header "Authorization: Bearer $2" \
|
||||||
$3 | jq -r '.layers[0].digest'
|
$3 | jq -r '.layers[0].digest'
|
||||||
else
|
else
|
||||||
curl \
|
curl -f --retry 10 --retry-max-time 60 --retry-connrefused \
|
||||||
--silent \
|
--silent \
|
||||||
--location \
|
--location \
|
||||||
--request GET \
|
--request GET \
|
||||||
|
@ -94,7 +94,7 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do
|
||||||
echo "[mod-init] Applying ${DOCKER_MOD} files to container"
|
echo "[mod-init] Applying ${DOCKER_MOD} files to container"
|
||||||
# Get Dockerhub token for api operations
|
# Get Dockerhub token for api operations
|
||||||
TOKEN=\
|
TOKEN=\
|
||||||
"$(curl \
|
"$(curl -f --retry 10 --retry-max-time 60 --retry-connrefused \
|
||||||
--silent \
|
--silent \
|
||||||
--header 'GET' \
|
--header 'GET' \
|
||||||
"${AUTH_URL}" \
|
"${AUTH_URL}" \
|
||||||
|
@ -107,13 +107,15 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do
|
||||||
echo "[mod-init] ${DOCKER_MOD} at ${SHALAYER} has been previously applied skipping"
|
echo "[mod-init] ${DOCKER_MOD} at ${SHALAYER} has been previously applied skipping"
|
||||||
else
|
else
|
||||||
# Download and extract layer to /
|
# Download and extract layer to /
|
||||||
curl \
|
curl -f --retry 10 --retry-max-time 60 --retry-all-errors \
|
||||||
--silent \
|
--silent \
|
||||||
--location \
|
--location \
|
||||||
--request GET \
|
--request GET \
|
||||||
--header "Authorization: Bearer ${TOKEN}" \
|
--header "Authorization: Bearer ${TOKEN}" \
|
||||||
"${BLOB_URL}${SHALAYER}" \
|
"${BLOB_URL}${SHALAYER}" -o \
|
||||||
| tar xz -C /
|
/modtarball.tar.xz
|
||||||
|
tar xzf /modtarball.tar.xz -C /
|
||||||
|
rm -rf /modtarball.tar.xz
|
||||||
echo ${SHALAYER} > "/${FILENAME}"
|
echo ${SHALAYER} > "/${FILENAME}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
Ładowanie…
Reference in New Issue