From 7ac9debaff4a57e0f94f4c2a1d15be6d4f8c5c21 Mon Sep 17 00:00:00 2001 From: Florian Bezdeka Date: Tue, 14 Jul 2020 18:20:32 +0200 Subject: [PATCH] kas-docker: Podman: Update podman flags to make isar builds working The --permissive and --cap-add options are conflicting for podman. --permissive tells podman to enable all capabilities so additional --cap-add options are not allowed / supported. Signed-off-by: Florian Bezdeka Signed-off-by: Jan Kiszka --- kas-docker | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/kas-docker b/kas-docker index 0d2913e..53cfce3 100755 --- a/kas-docker +++ b/kas-docker @@ -106,12 +106,19 @@ while [ $# -gt 0 ]; do case "$1" in --isar) DOCKER_IMAGE="$(echo "${DOCKER_IMAGE}" | sed 's|kasproject/kas|kasproject/kas-isar|g')" - ISAR_ARGS="--cap-add=SYS_ADMIN --cap-add=MKNOD --privileged" + ISAR_ARGS="--privileged" - # sudo is needed for a privileged podman container - if [ "${KAS_DOCKER_ENGINE}" = "podman" ]; then + case "${KAS_DOCKER_ENGINE}" in + docker) + ISAR_ARGS="${ISAR_ARGS} --cap-add=SYS_ADMIN" + ISAR_ARGS="${ISAR_ARGS} --cap-add=MKNOD" + ;; + podman) + # sudo is needed for a privileged podman container DOCKER_COMMAND="sudo ${DOCKER_COMMAND}" - fi + ;; + esac + shift 1 ;; --with-loop-dev)