github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-17 17:02:42 +00:00
Code Issues Projects Releases Wiki Activity

ci: pause-image no sudo

Browse Source 
Build pause-image without sudo docker this is not needed. This is part 5 of N

Signed-off-by: Zvonko Kaiser <zkaiser@nvidia.com>
This commit is contained in:
Zvonko Kaiser 2024-05-28 11:31:59 +00:00
parent a7931115a0
commit 6c9c0306ac
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/static-build/pause-image/build-static-pause-image.sh
View File

@ -19,8 +19,8 @@ pull_pause_image_from_remote() {
echo "pull pause image from remote" echo "pull pause image from remote"
skopeo copy "${pause_image_repo}":"${pause_image_version}" oci:pause:"${pause_image_version}" skopeo copy "${pause_image_repo}":"${pause_image_version}" oci:pause:"${pause_image_version}"
umoci unpack --image pause:"${pause_image_version}" "${DESTDIR}/pause_bundle" umoci unpack --rootless --image pause:"${pause_image_version}" "${DESTDIR}/pause_bundle"
rm "${DESTDIR}/pause_bundle/umoci.json" rm "${DESTDIR}/pause_bundle/umoci.json"
} }
pull_pause_image_from_remote $@ pull_pause_image_from_remote "$@"

7
tools/packaging/static-build/pause-image/build.sh
View File

@ -28,16 +28,17 @@ package_output_dir="${package_output_dir:-}"
container_image="${PAUSE_IMAGE_CONTAINER_BUILDER:-$(get_pause_image_name)}" container_image="${PAUSE_IMAGE_CONTAINER_BUILDER:-$(get_pause_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} || \ docker pull ${container_image} || \
(sudo docker $BUILDX build $PLATFORM \ (docker $BUILDX build $PLATFORM \
-t "${container_image}" "${script_dir}" && \ -t "${container_image}" "${script_dir}" && \
# 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 docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \ docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
-w "${PWD}" \ -w "${PWD}" \
--env DESTDIR="${DESTDIR}" \ --env DESTDIR="${DESTDIR}" \
--env pause_image_repo="${pause_image_repo}" \ --env pause_image_repo="${pause_image_repo}" \
--env pause_image_version="${pause_image_version}" \ --env pause_image_version="${pause_image_version}" \
--user "$(id -u)":"$(id -g)" \
"${container_image}" \ "${container_image}" \
bash -c "${pause_image_builder}" bash -c "${pause_image_builder}"