|
20 | 20 | setup_env() |
21 | 21 | { |
22 | 22 | ##Version |
23 | | - SBF_VERSION="1.0.7" && echo -e "[+] SBUILD Functions Version: ${SBF_VERSION}" ; unset SBF_VERSION |
| 23 | + SBF_VERSION="1.0.8" && echo -e "[+] SBUILD Functions Version: ${SBF_VERSION}" ; unset SBF_VERSION |
24 | 24 | ##Input |
25 | 25 | INPUT_SBUILD="${1:-$(echo "$@" | tr -d '[:space:]')}" |
26 | 26 | INPUT_SBUILD_PATH="$(realpath ${INPUT_SBUILD})" ; export INPUT_SBUILD="${INPUT_SBUILD_PATH}" |
@@ -65,6 +65,34 @@ check_sane_env() |
65 | 65 | export -f check_sane_env |
66 | 66 | #-------------------------------------------------------# |
67 | 67 |
|
| 68 | +#-------------------------------------------------------# |
| 69 | +##Cleanup & Purge Containers |
| 70 | +cleanup_containers() |
| 71 | +{ |
| 72 | + #Alpine |
| 73 | + ( docker stop "alpine-builder" >/dev/null 2>&1 ; docker rm "alpine-builder" >/dev/null 2>&1 ) &>/dev/null |
| 74 | + ( sudo docker stop "alpine-builder" >/dev/null 2>&1 ; sudo docker rm "alpine-builder" >/dev/null 2>&1 ) &>/dev/null |
| 75 | + #Alpine-mimalloc |
| 76 | + ( docker stop "alpine-builder-mimalloc" >/dev/null 2>&1 ; docker rm "alpine-builder-mimalloc" >/dev/null 2>&1 ) &>/dev/null |
| 77 | + ( sudo docker stop "alpine-builder-mimalloc" >/dev/null 2>&1 ; sudo docker rm "alpine-builder-mimalloc" >/dev/null 2>&1 ) &>/dev/null |
| 78 | + #Archlinux |
| 79 | + ( docker stop "archlinux-builder" >/dev/null 2>&1 ; docker rm "archlinux-builder" >/dev/null 2>&1 ) &>/dev/null |
| 80 | + ( sudo docker stop "archlinux-builder" >/dev/null 2>&1 ; sudo docker rm "archlinux-builder" >/dev/null 2>&1 ) &>/dev/null |
| 81 | + #Debian |
| 82 | + ( docker stop "debian-builder" >/dev/null 2>&1 ; docker rm "debian-builder" >/dev/null 2>&1 ) &>/dev/null |
| 83 | + ( sudo docker stop "debian-builder" >/dev/null 2>&1 ; sudo docker rm "debian-builder" >/dev/null 2>&1 ) &>/dev/null |
| 84 | + #Debian-Unstable |
| 85 | + ( docker stop "debian-builder-unstable" >/dev/null 2>&1 ; docker rm "debian-builder-unstable" >/dev/null 2>&1 ) &>/dev/null |
| 86 | + ( sudo docker stop "debian-builder-unstable" >/dev/null 2>&1 ; sudo docker rm "debian-builder-unstable" >/dev/null 2>&1 ) &>/dev/null |
| 87 | + #Ubuntu |
| 88 | + ( docker stop "ubuntu-builder" >/dev/null 2>&1 ; docker rm "ubuntu-builder" >/dev/null 2>&1 ) &>/dev/null |
| 89 | + ( sudo docker stop "ubuntu-builder" >/dev/null 2>&1 ; sudo docker rm "ubuntu-builder" >/dev/null 2>&1 ) &>/dev/null |
| 90 | + #Cleanup |
| 91 | + wait >/dev/null 2>&1 ; echo |
| 92 | +} |
| 93 | +export -f cleanup_containers |
| 94 | +#-------------------------------------------------------# |
| 95 | + |
68 | 96 | #-------------------------------------------------------# |
69 | 97 | ##Fetch Version (Upstream) (.version_upstream) |
70 | 98 | fetch_version_upstream() |
@@ -326,7 +354,9 @@ if [[ "${CONTINUE_SBUILD}" == "YES" ]]; then |
326 | 354 | check_sane_env |
327 | 355 | pushd "${SBUILD_OUTDIR}" >/dev/null 2>&1 |
328 | 356 | #printf "\n" && timeout -k 5m 60m "${TMPXRUN}" ; printf "\n" |
329 | | - printf "\n" && timeout -k 5m 60m sbuild --log-level "verbose" "${INPUT_SBUILD}" --timeout-linter "120" --outdir "${SBUILD_OUTDIR}/BUILD" --keep ; printf "\n" |
| 357 | + cleanup_containers |
| 358 | + printf "\n" && timeout -k 5m 60m sbuild --log-level "verbose" "${INPUT_SBUILD}" --timeout-linter "120" --outdir "${SBUILD_OUTDIR}/BUILD" --keep |
| 359 | + printf "\n" && cleanup_containers |
330 | 360 | unset ARTIFACTS_DIR ; ARTIFACTS_DIR="$(find "${SBUILD_OUTDIR}/BUILD" -name "SBUILD" -type f -exec dirname "{}" \; | xargs realpath | head -n 1 | tr -d '[:space:]')" |
331 | 361 | if [ -d "${ARTIFACTS_DIR}" ] && [ $(du -s "${ARTIFACTS_DIR}" | cut -f1) -gt 10 ]; then |
332 | 362 | rsync -achL "${ARTIFACTS_DIR}/." "${SBUILD_OUTDIR}" |
|
0 commit comments