github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-25 19:21:53 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Improve qemu build image handling

Browse Source 
Let's create the QEMU build image based on the version of QEMU used, so
if we happen to have a parallel build we ensure different images are
being used.

Also, let's ensure the image gets remove after the build.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2022-09-05 08:42:35 +02:00
parent abe89586c6
commit 1f610ea5cc
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,8 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d")
[ -n "${build_suffix}" ] && HYPERVISOR_NAME="kata-qemu-${build_suffix}" || HYPERVISOR_NAME="kata-qemu" [ -n "${build_suffix}" ] && HYPERVISOR_NAME="kata-qemu-${build_suffix}" || HYPERVISOR_NAME="kata-qemu"
[ -n "${build_suffix}" ] && PKGVERSION="kata-static-${build_suffix}" || PKGVERSION="kata-static" [ -n "${build_suffix}" ] && PKGVERSION="kata-static-${build_suffix}" || PKGVERSION="kata-static"
container_image="qemu-static-${qemu_version,,}"
sudo "${container_engine}" 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} \
@ -51,12 +53,14 @@ sudo "${container_engine}" build \
--build-arg PREFIX="${prefix}" \ --build-arg PREFIX="${prefix}" \
"${packaging_dir}" \ "${packaging_dir}" \
-f "${script_dir}/Dockerfile" \ -f "${script_dir}/Dockerfile" \
-t qemu-static -t "${container_image}"
sudo "${container_engine}" run \ sudo "${container_engine}" run \
--rm \ --rm \
-i \ -i \
-v "${PWD}":/share qemu-static \ -v "${PWD}":/share "${container_image}" \
mv "${qemu_destdir}/${qemu_tar}" /share/ mv "${qemu_destdir}/${qemu_tar}" /share/
sudo docker image rm "${container_image}"
sudo chown ${USER}:$(id -gn ${USER}) "${PWD}/${qemu_tar}" sudo chown ${USER}:$(id -gn ${USER}) "${PWD}/${qemu_tar}"