diff --git a/root/docker-mods b/root/docker-mods index 732f167..5c7d4fd 100755 --- a/root/docker-mods +++ b/root/docker-mods @@ -116,16 +116,30 @@ for DOCKER_MOD in "${DOCKER_MODS[@]}"; do echo "[mod-init] ${DOCKER_MOD} at ${SHALAYER} has been previously applied skipping" else # Download and extract layer to / - curl -f --retry 10 --retry-max-time 60 --retry-all-errors \ + curl -f --retry 10 --retry-max-time 60 --retry-connrefused \ --silent \ --location \ --request GET \ --header "Authorization: Bearer ${TOKEN}" \ "${BLOB_URL}${SHALAYER}" -o \ /modtarball.tar.xz - tar xzf /modtarball.tar.xz -C / + mkdir -p /tmp/mod + tar xzf /modtarball.tar.xz -C /tmp/mod + if [ -d /tmp/mod/etc/s6-overlay ]; then + if [ -d /tmp/mod/etc/cont-init.d ]; then + rm -rf /tmp/mod/etc/cont-init.d + fi + if [ -d /tmp/mod/etc/services.d ]; then + rm -rf /tmp/mod/etc/services.d + fi + fi + shopt -s dotglob + cp -R /tmp/mod/* / + shopt -u dotglob + rm -rf /tmp/mod rm -rf /modtarball.tar.xz echo ${SHALAYER} > "/${FILENAME}" + echo "[mod-init] ${DOCKER_MOD} applied to container" fi done