github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 23:38:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8904 from GabyCT/topic/buildbq

Browse Source 
tools: Use defined variable in build base qemu script
This commit is contained in:
GabyCT 2024-01-25 13:51:44 -06:00 committed by GitHub
commit aa958adf90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 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

@ -47,7 +47,7 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d")
container_image="${QEMU_CONTAINER_BUILDER:-$(get_qemu_image_name)}" container_image="${QEMU_CONTAINER_BUILDER:-$(get_qemu_image_name)}"
[ "${CROSS_BUILD}" == "true" ] && container_image="${container_image}-cross-build" [ "${CROSS_BUILD}" == "true" ] && container_image="${container_image}-cross-build"
sudo docker pull ${container_image} || (sudo "${container_engine}" build \ sudo ${container_engine} pull ${container_image} || (sudo "${container_engine}" build \
--build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \ --build-arg CACHE_TIMEOUT="${CACHE_TIMEOUT}" \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \ --build-arg https_proxy="${https_proxy}" \
@ -56,8 +56,8 @@ sudo docker pull ${container_image} || (sudo "${container_engine}" build \
"${packaging_dir}" \ "${packaging_dir}" \
-f "${script_dir}/Dockerfile" \ -f "${script_dir}/Dockerfile" \
-t "${container_image}" && \ -t "${container_image}" && \
# No-op unless PUSH_TO_REGISTRY is exported as "yes" # No-op unless PUSH_TO_REGISTRY is exported as "yes"
push_to_registry "${container_image}") push_to_registry "${container_image}")
sudo "${container_engine}" run \ sudo "${container_engine}" run \
--rm \ --rm \