github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-10 15:56:47 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Forward USE_DEVMAPPER in local build scripts

Browse Source 
Pass USE_DEVMAPPER through the Docker environment in local build
scripts. Extract the OCI tag sanitization logic into a public helper
of sanitize_tag_component to keep push and pull paths consistent.

Signed-off-by: Alex Lyn <alex.lyn@antgroup.com>
This commit is contained in:
Alex Lyn
2026-06-16 15:37:09 +08:00
parent 8a7be7af69
commit 91d8fe44c0
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/packaging/kata-deploy/local-build/kata-deploy-binaries-in-docker.sh
View File

@@ -121,6 +121,7 @@ RUNTIME_CHOICE="${RUNTIME_CHOICE:-both}"
IMAGE_SIZE_ALIGNMENT_MB=${IMAGE_SIZE_ALIGNMENT_MB:-}
KERNEL_DEBUG_ENABLED="${KERNEL_DEBUG_ENABLED:-}"
INIT_DATA="${INIT_DATA:-yes}"
USE_DEVMAPPER="${USE_DEVMAPPER:-no}"
docker run \
-v "${HOME}"/.docker:/root/.docker \
@@ -159,6 +160,7 @@ docker run \
--env REPO_URL_X86_64="${REPO_URL_X86_64}" \
--env REPO_COMPONENTS="${REPO_COMPONENTS}" \
--env AGENT_POLICY="${AGENT_POLICY}" \
--env USE_DEVMAPPER="${USE_DEVMAPPER}" \
--env RUNTIME_CHOICE="${RUNTIME_CHOICE}" \
--env IMAGE_SIZE_ALIGNMENT_MB="${IMAGE_SIZE_ALIGNMENT_MB}" \
--env KERNEL_DEBUG_ENABLED="${KERNEL_DEBUG_ENABLED}" \

18
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -88,6 +88,11 @@ error() {
echo "ERROR: $*"
}
# Sanitize a string so it is valid as a Docker / OCI image tag component.
sanitize_tag_component() {
echo "$1" | tr -dc '[:print:]' | tr -c 'a-zA-Z0-9_.\-' _
}
usage() {
return_code=${1:-0}
cat <<EOF
@@ -276,7 +281,7 @@ install_cached_tarball_component() {
install_cached_shim_v2_tarball_get_root_hash
fi
oras pull "${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-${TARGET_BRANCH}-$(uname -m)" || return 1
oras pull "${ARTEFACT_REGISTRY}/${ARTEFACT_REPOSITORY}/cached-artefacts/${build_target}:latest-$(sanitize_tag_component "${TARGET_BRANCH}")-$(uname -m)" || return 1
cached_version="$(cat "${component}"-version)"
cached_image_version="$(cat "${component}"-builder-image-version)"
@@ -1614,14 +1619,11 @@ handle_build() {
normalized_tags=""
for tag in "${tags[@]}"; do
# tags can only contain lowercase and uppercase letters, digits, underscores, periods, and hyphens
# and limited to 128 characters, so filter out non-printable characers, replace invalid printable
# characters with underscode and trim down to leave enough space for the arch suffix
# and are limited to 128 characters. Sanitize via the shared helper
# (the pull path uses the same helper) and trim down to leave room
# for the arch suffix.
tag_length_limit="$((128 - $(echo "-$(uname -m)" | wc -c)))"
normalized_tag="$(echo "${tag}" \
| tr -dc '[:print:]' \
| tr -c 'a-zA-Z0-9_.\-' _ \
| head -c "${tag_length_limit}" \
)-$(uname -m)"
normalized_tag="$(sanitize_tag_component "${tag}" | head -c "${tag_length_limit}")-$(uname -m)"
normalized_tags="${normalized_tags},${normalized_tag}"
done
declare -a files_to_push=(