Skip to content

Commit

Permalink
Merge pull request #8904 from GabyCT/topic/buildbq
Browse files Browse the repository at this point in the history
tools: Use defined variable in build base qemu script
  • Loading branch information
GabyCT committed Jan 25, 2024
2 parents 36fc2fd + 98b5a19 commit aa958ad
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/packaging/static-build/qemu/build-base-qemu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ CACHE_TIMEOUT=$(date +"%Y-%m-%d")
container_image="${QEMU_CONTAINER_BUILDER:-$(get_qemu_image_name)}"
[ "${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 http_proxy="${http_proxy}" \
--build-arg https_proxy="${https_proxy}" \
Expand All @@ -56,8 +56,8 @@ sudo docker pull ${container_image} || (sudo "${container_engine}" build \
"${packaging_dir}" \
-f "${script_dir}/Dockerfile" \
-t "${container_image}" && \
# No-op unless PUSH_TO_REGISTRY is exported as "yes"
push_to_registry "${container_image}")
# No-op unless PUSH_TO_REGISTRY is exported as "yes"
push_to_registry "${container_image}")

sudo "${container_engine}" run \
--rm \
Expand Down

0 comments on commit aa958ad

Please sign in to comment.