github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-29 20:24:31 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Support Podman in QEMU build

Browse Source 
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 <jakob.naucke@ibm.com>
This commit is contained in:
Jakob Naucke 2021-06-18 16:44:17 +02:00
parent 5a22e0e3b1
commit f35ba94d30
No known key found for this signature in database
GPG Key ID: 45FA1C7D310C0EBE
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/packaging/static-build/qemu/build-base-qemu.sh
View File

@ -15,6 +15,8 @@ source "${script_dir}/../qemu.blacklist"
packaging_dir="${script_dir}/../.." packaging_dir="${script_dir}/../.."
qemu_destdir="/tmp/qemu-static/" qemu_destdir="/tmp/qemu-static/"
container_engine="${USE_PODMAN:+podman}"
container_engine="${container_engine:-docker}"
qemu_repo="${qemu_repo:-$1}" qemu_repo="${qemu_repo:-$1}"
qemu_version="${qemu_version:-$2}" qemu_version="${qemu_version:-$2}"
@ -32,7 +34,7 @@ prefix="${prefix:-"/opt/kata"}"
CACHE_TIMEOUT=$(date +"%Y-%m-%d") CACHE_TIMEOUT=$(date +"%Y-%m-%d")
sudo docker build \ sudo "${container_engine}" build \
--build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \ --build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \
--build-arg BUILD_SUFFIX="${build_suffix}" \ --build-arg BUILD_SUFFIX="${build_suffix}" \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
@ -46,7 +48,7 @@ sudo docker build \
-f "${script_dir}/Dockerfile" \ -f "${script_dir}/Dockerfile" \
-t qemu-static -t qemu-static
sudo docker run \ sudo "${container_engine}" run \
--rm \ --rm \
-i \ -i \
-v "${PWD}":/share qemu-static \ -v "${PWD}":/share qemu-static \