github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Use buildx in favor of FROM --platform syntax

Browse Source 
Signed-off-by: Sascha Grunert <mail@saschagrunert.de>
This commit is contained in:
Sascha Grunert 2021-01-28 14:53:09 +01:00
parent 9f2f1b8c46
commit 646a202440
No known key found for this signature in database
GPG Key ID: BEDA150F1B0AFEEC
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/lib/release.sh
View File

@ -375,7 +375,7 @@ function kube::release::create_docker_images_for_server() {
ln "${KUBE_ROOT}/build/nsswitch.conf" "${docker_build_path}/nsswitch.conf" ln "${KUBE_ROOT}/build/nsswitch.conf" "${docker_build_path}/nsswitch.conf"
chmod 0644 "${docker_build_path}/nsswitch.conf" chmod 0644 "${docker_build_path}/nsswitch.conf"
cat <<EOF > "${docker_file_path}" cat <<EOF > "${docker_file_path}"
FROM --platform=linux/${arch} ${base_image} FROM ${base_image}
COPY ${binary_name} /usr/local/bin/${binary_name} COPY ${binary_name} /usr/local/bin/${binary_name}
EOF EOF
# ensure /etc/nsswitch.conf exists so go's resolver respects /etc/hosts # ensure /etc/nsswitch.conf exists so go's resolver respects /etc/hosts
@ -383,11 +383,13 @@ EOF
echo "COPY nsswitch.conf /etc/" >> "${docker_file_path}" echo "COPY nsswitch.conf /etc/" >> "${docker_file_path}"
fi fi
if [[ "${arch}" == "linux/s390x" || "${arch}" == "linux/ppc64le" ]]; then "${DOCKER[@]}" buildx build \
DOCKER_CLI_EXPERIMENTAL=enabled "${DOCKER[@]}" buildx build --platform linux/"${arch}" --load ${docker_build_opts:+"${docker_build_opts}"} -q -t "${docker_image_tag}" "${docker_build_path}" >/dev/null --platform linux/"${arch}" \
else --load ${docker_build_opts:+"${docker_build_opts}"} \
"${DOCKER[@]}" build ${docker_build_opts:+"${docker_build_opts}"} -q -t "${docker_image_tag}" "${docker_build_path}" >/dev/null -q \
fi -t "${docker_image_tag}" \
"${docker_build_path}" >/dev/null
# If we are building an official/alpha/beta release we want to keep # If we are building an official/alpha/beta release we want to keep
# docker images and tag them appropriately. # docker images and tag them appropriately.
local -r release_docker_image_tag="${KUBE_DOCKER_REGISTRY-$docker_registry}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG-$docker_tag}" local -r release_docker_image_tag="${KUBE_DOCKER_REGISTRY-$docker_registry}/${binary_name}-${arch}:${KUBE_DOCKER_IMAGE_TAG-$docker_tag}"