mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 10:20:51 +00:00
Merge pull request #82778 from chendave/split_build_scripts
Differentiate build process for non-amd platforms
This commit is contained in:
commit
0a3cd56092
@ -144,28 +144,40 @@ build() {
|
||||
|
||||
base_image=""
|
||||
if [[ -f BASEIMAGE ]]; then
|
||||
base_image=$(getBaseImage "${os_arch}" | ${SED} "s|REGISTRY|${REGISTRY}|g")
|
||||
${SED} -i "s|BASEARCH|${arch}|g" $dockerfile_name
|
||||
base_image=$(getBaseImage "${os_arch}" | "${SED}" "s|REGISTRY|${REGISTRY}|g")
|
||||
"${SED}" -i "s|BASEARCH|${arch}|g" $dockerfile_name
|
||||
fi
|
||||
|
||||
# copy the qemu-*-static binary to docker image to build the multi architecture image on x86 platform
|
||||
if grep -q "CROSS_BUILD_" Dockerfile; then
|
||||
if [[ "${arch}" == "amd64" ]]; then
|
||||
${SED} -i "/CROSS_BUILD_/d" Dockerfile
|
||||
else
|
||||
${SED} -i "s|QEMUARCH|${QEMUARCHS[$arch]}|g" Dockerfile
|
||||
# Register qemu-*-static for all supported processors except the current one
|
||||
echo "Registering qemu-*-static binaries in the kernel"
|
||||
local sudo=""
|
||||
if [[ $(id -u) != 0 ]]; then
|
||||
sudo=sudo
|
||||
# Only the cross-build on x86 is guaranteed by far, other arches like aarch64 doesn't support cross-build
|
||||
# thus, there is no need to tackle a disability feature on those platforms, and also help to prevent from
|
||||
# ending up a wrong image tag on non-amd64 platforms.
|
||||
build_arch=$(uname -m)
|
||||
if [[ ${build_arch} = 'x86_64' ]]; then
|
||||
# copy the qemu-*-static binary to docker image to build the multi architecture image on x86 platform
|
||||
if grep -q 'CROSS_BUILD_' Dockerfile; then
|
||||
if [[ "${arch}" = 'amd64' ]]; then
|
||||
"${SED}" -i '/CROSS_BUILD_/d' Dockerfile
|
||||
else
|
||||
"${SED}" -i "s|QEMUARCH|${QEMUARCHS[$arch]}|g" Dockerfile
|
||||
# Register qemu-*-static for all supported processors except the current one
|
||||
echo 'Registering qemu-*-static binaries in the kernel'
|
||||
local sudo
|
||||
if [[ $(id -u) -ne 0 ]]; then
|
||||
sudo=sudo
|
||||
fi
|
||||
${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset -p yes
|
||||
curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/"${QEMUVERSION}"/x86_64_qemu-"${QEMUARCHS[$arch]}"-static.tar.gz | tar -xz -C "${temp_dir}"
|
||||
# Ensure we don't get surprised by umask settings
|
||||
chmod 0755 "${temp_dir}/qemu-${QEMUARCHS[$arch]}-static"
|
||||
"${SED}" -i 's/CROSS_BUILD_//g' Dockerfile
|
||||
fi
|
||||
fi
|
||||
${sudo} "${KUBE_ROOT}/third_party/multiarch/qemu-user-static/register/register.sh" --reset -p yes
|
||||
curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/"${QEMUVERSION}"/x86_64_qemu-"${QEMUARCHS[$arch]}"-static.tar.gz | tar -xz -C "${temp_dir}"
|
||||
# Ensure we don't get surprised by umask settings
|
||||
chmod 0755 "${temp_dir}/qemu-${QEMUARCHS[$arch]}-static"
|
||||
${SED} -i "s/CROSS_BUILD_//g" Dockerfile
|
||||
fi
|
||||
elif [[ "${QEMUARCHS[$arch]}" != "${build_arch}" ]]; then
|
||||
echo "skip cross-build $arch on non-supported platform ${build_arch}."
|
||||
popd
|
||||
continue
|
||||
else
|
||||
"${SED}" -i '/CROSS_BUILD_/d' Dockerfile
|
||||
fi
|
||||
|
||||
docker buildx build --progress=plain --no-cache --pull --output=type="${output_type}" --platform "${os_name}/${arch}" \
|
||||
@ -210,7 +222,7 @@ push() {
|
||||
# reset manifest list; needed in case multiple images are being built / pushed.
|
||||
manifest=()
|
||||
# Make os_archs list into image manifest. Eg: 'linux/amd64 linux/ppc64le' to '${REGISTRY}/${image}:${TAG}-linux-amd64 ${REGISTRY}/${image}:${TAG}-linux-ppc64le'
|
||||
while IFS='' read -r line; do manifest+=("$line"); done < <(echo "$os_archs" | ${SED} "s~\/~-~g" | ${SED} -e "s~[^ ]*~$REGISTRY\/$image:$TAG\-&~g")
|
||||
while IFS='' read -r line; do manifest+=("$line"); done < <(echo "$os_archs" | "${SED}" "s~\/~-~g" | "${SED}" -e "s~[^ ]*~$REGISTRY\/$image:$TAG\-&~g")
|
||||
docker manifest create --amend "${REGISTRY}/${image}:${TAG}" "${manifest[@]}"
|
||||
|
||||
# We will need the full registry name in order to set the "os.version" for Windows images.
|
||||
|
Loading…
Reference in New Issue
Block a user