SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kas-docker: Podman: Update podman flags to make isar builds working

Browse Source 
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 <florian@bezdeka.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Florian Bezdeka 2020-07-14 18:20:32 +02:00 committed by Jan Kiszka
parent 1688d60177
commit 7ac9debaff
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kas-docker
View File

@ -106,12 +106,19 @@ while [ $# -gt 0 ]; do
case "$1" in case "$1" in
--isar) --isar)
DOCKER_IMAGE="$(echo "${DOCKER_IMAGE}" | sed 's|kasproject/kas|kasproject/kas-isar|g')" 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"
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 # sudo is needed for a privileged podman container
if [ "${KAS_DOCKER_ENGINE}" = "podman" ]; then
DOCKER_COMMAND="sudo ${DOCKER_COMMAND}" DOCKER_COMMAND="sudo ${DOCKER_COMMAND}"
fi ;;
esac
shift 1 shift 1
;; ;;
--with-loop-dev) --with-loop-dev)