From 54ab356f9f349fc44a277ca3042ee110e77b3e77 Mon Sep 17 00:00:00 2001 From: Uladzimir Bely Date: Fri, 28 Jan 2022 12:56:00 +0100 Subject: [PATCH] Dockerfile.isar: support of sbuild Upcoming support of sbuild in Isar requires some additional tools to be preinstalled. Also, `builder` user should be in `sbuild` group. Additionally, to use external volume for schroot overlay because the 'upper' overlayfs layer of sbuild can't be based on another overlayfs filesystem that happens in case of using Docker. Signed-off-by: Uladzimir Bely Signed-off-by: Jan Kiszka --- Dockerfile.isar | 2 ++ kas-container | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Dockerfile.isar b/Dockerfile.isar index 4f27155..70bde9a 100644 --- a/Dockerfile.isar +++ b/Dockerfile.isar @@ -12,8 +12,10 @@ RUN apt-get update && \ autoconf automake gdisk libtool bash-completion \ reprepro python3 binfmt-support e2fsprogs \ umoci skopeo \ + git-buildpackage pristine-tar schroot sbuild debhelper \ multistrap qemu-user-static debootstrap quilt && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN sed -i 's|\tGOSU="gosu builder"|\0\n\tsbuild-adduser builder|' /kas/container-entrypoint RUN sed -i 's|#!/bin/bash|\0\n\nupdate-binfmts --enable \&\& [ -f /proc/sys/fs/binfmt_misc/status ]|' /kas/container-entrypoint diff --git a/kas-container b/kas-container index 47f5610..223cc49 100755 --- a/kas-container +++ b/kas-container @@ -91,6 +91,10 @@ enable_isar_mode() { KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas-isar" KAS_ISAR_ARGS="--privileged" + SCHROOT_OVERLAY_DIR="${KAS_BUILD_DIR}/tmp/schroot-overlay" + trace mkdir -p "${SCHROOT_OVERLAY_DIR}" + KAS_ISAR_ARGS="${KAS_ISAR_ARGS} -v ${SCHROOT_OVERLAY_DIR}:/var/lib/schroot/union/overlay:rw" + if [ "${KAS_CONTAINER_ENGINE}" = "podman" ]; then # sudo is needed for a privileged podman container KAS_CONTAINER_COMMAND="sudo ${KAS_CONTAINER_COMMAND}"