From f35ba94d30e35c80e78291b039018fbea78a6998 Mon Sep 17 00:00:00 2001 From: Jakob Naucke Date: Fri, 18 Jun 2021 16:44:17 +0200 Subject: [PATCH] packaging: Support Podman in QEMU build Use Podman instead of Docker when $USE_PODMAN is set. This enables running with Podman, e.g. to import images for CRI-O. Fixes: #2067 Signed-off-by: Jakob Naucke --- tools/packaging/static-build/qemu/build-base-qemu.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/packaging/static-build/qemu/build-base-qemu.sh b/tools/packaging/static-build/qemu/build-base-qemu.sh index dc4930d38a..a45651f155 100755 --- a/tools/packaging/static-build/qemu/build-base-qemu.sh +++ b/tools/packaging/static-build/qemu/build-base-qemu.sh @@ -15,6 +15,8 @@ source "${script_dir}/../qemu.blacklist" packaging_dir="${script_dir}/../.." qemu_destdir="/tmp/qemu-static/" +container_engine="${USE_PODMAN:+podman}" +container_engine="${container_engine:-docker}" qemu_repo="${qemu_repo:-$1}" qemu_version="${qemu_version:-$2}" @@ -32,7 +34,7 @@ prefix="${prefix:-"/opt/kata"}" CACHE_TIMEOUT=$(date +"%Y-%m-%d") -sudo docker build \ +sudo "${container_engine}" build \ --build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \ --build-arg BUILD_SUFFIX="${build_suffix}" \ --build-arg http_proxy="${http_proxy}" \ @@ -46,7 +48,7 @@ sudo docker build \ -f "${script_dir}/Dockerfile" \ -t qemu-static -sudo docker run \ +sudo "${container_engine}" run \ --rm \ -i \ -v "${PWD}":/share qemu-static \