Split apt and pip install stages

This commit is contained in:
Heiko Reese
2021-09-06 02:02:37 +02:00
parent aa8f4c5e02
commit 71b3950c03

View File

@ -46,6 +46,8 @@ for i in "${images[@]}"; do
basectr=$(echo "${i}" | cut -d'|' -f1) basectr=$(echo "${i}" | cut -d'|' -f1)
name=$(echo "${i}" | cut -d'|' -f2) name=$(echo "${i}" | cut -d'|' -f2)
IMAGENAME="${BASENAME}-${name}"
echo "🔨 Assembling »${IMAGENAME}«"
ctr="$(buildah from "$basectr")" ctr="$(buildah from "$basectr")"
buildah run "$ctr" /bin/sh -c 'apt-get update; \ buildah run "$ctr" /bin/sh -c 'apt-get update; \
DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y \ DEBIAN_FRONTEND=noninteractive DEBIAN_PRIORITY=critical apt-get install -y \
@ -64,16 +66,15 @@ for i in "${images[@]}"; do
git-buildpackage \ git-buildpackage \
debsigs \ debsigs \
gpgv1; \ gpgv1; \
pip3 install meson ninja; \ rm -rf /var/lib/apt/lists/*;'
rm -rf /var/lib/apt/lists/*; \ buildah run "$ctr" /bin/sh -c \
rm -rf ~/.cache/pip/*;' 'pip3 install meson ninja; \
IMAGENAME="${BASENAME}-${name}" rm -rf ~/.cache/pip/*;'
TARGET="${REGISTRY}/${BASENAME}-${name}:${TAG}" TARGET="${REGISTRY}/${BASENAME}-${name}:${TAG}"
echo "⚙️ Assembling »${IMAGENAME}«"
IMAGEID=$(buildah commit --format docker "$ctr" "${IMAGENAME}") IMAGEID=$(buildah commit --format docker "$ctr" "${IMAGENAME}")
if [ "${REGISTRY}" != "none" ]; then if [ "${REGISTRY}" != "none" ]; then
echo "🚀 Pushing »${TARGET}«" echo "🚀 Pushing »${TARGET}«"
buildah push "${IMAGEID}" "${TARGET}" buildah push "${IMAGEID}" "${TARGET}"
echo "💡 Finished »${BASENAME}«" echo " Finished »${BASENAME}«"
fi fi
done done