From 71b3950c033a57a3487fd6813ae31db49fa93499 Mon Sep 17 00:00:00 2001 From: Heiko Reese Date: Mon, 6 Sep 2021 02:02:37 +0200 Subject: [PATCH] Split apt and pip install stages --- ci_container/build.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ci_container/build.sh b/ci_container/build.sh index c2c53bc..da63c15 100755 --- a/ci_container/build.sh +++ b/ci_container/build.sh @@ -46,6 +46,8 @@ for i in "${images[@]}"; do basectr=$(echo "${i}" | cut -d'|' -f1) name=$(echo "${i}" | cut -d'|' -f2) + IMAGENAME="${BASENAME}-${name}" + echo "🔨 Assembling »${IMAGENAME}«" ctr="$(buildah from "$basectr")" buildah run "$ctr" /bin/sh -c 'apt-get update; \ DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y \ @@ -64,16 +66,15 @@ for i in "${images[@]}"; do git-buildpackage \ debsigs \ gpgv1; \ - pip3 install meson ninja; \ - rm -rf /var/lib/apt/lists/*; \ - rm -rf ~/.cache/pip/*;' - IMAGENAME="${BASENAME}-${name}" + rm -rf /var/lib/apt/lists/*;' + buildah run "$ctr" /bin/sh -c \ + 'pip3 install meson ninja; \ + rm -rf ~/.cache/pip/*;' TARGET="${REGISTRY}/${BASENAME}-${name}:${TAG}" - echo "⚙️ Assembling »${IMAGENAME}«" IMAGEID=$(buildah commit --format docker "$ctr" "${IMAGENAME}") if [ "${REGISTRY}" != "none" ]; then echo "🚀 Pushing »${TARGET}«" buildah push "${IMAGEID}" "${TARGET}" - echo "💡 Finished »${BASENAME}«" + echo "✅ Finished »${BASENAME}«" fi done