github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-01 20:06:35 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Use different images for s390x and aarch64

Browse Source 
As the image provided as part of registry.centos.org is not a multi-arch
one, at least not for CentOS 7, we need to expand the script used to
build the image to pass images that are known to work for s390x (ClefOS)
and aarch64 (CentOS, but coming from dockerhub).

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-03-02 15:49:01 +01:00
parent 6267909501
commit 78ba363f8e
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh
View File

@ -18,14 +18,23 @@ pushd ${KATA_DEPLOY_DIR}
IMAGE_TAG="${REGISTRY}:kata-containers-$(git rev-parse HEAD)-$(uname -m)" IMAGE_TAG="${REGISTRY}:kata-containers-$(git rev-parse HEAD)-$(uname -m)"
echo "Building the image" echo "Building the image"
if [ "$(uname -m)" = "s390x" ]; then case $(uname -m) in
docker build \ aarch64)
--build-arg BASE_IMAGE_NAME=clefos \ docker build \
--build-arg BASE_IMAGE_TAG=7 \ --build-arg BASE_IMAGE_NAME=cdocker.io/library/centos \
--tag ${IMAGE_TAG} . --build-arg BASE_IMAGE_TAG=7 \
else --tag ${IMAGE_TAG} .
docker build --tag ${IMAGE_TAG} . ;;
fi s390x)
docker build \
--build-arg BASE_IMAGE_NAME=docker.io/library/clefos \
--build-arg BASE_IMAGE_TAG=7 \
--tag ${IMAGE_TAG} .
;;
*)
docker build --tag ${IMAGE_TAG} .
;;
esac
echo "Pushing the image to quay.io" echo "Pushing the image to quay.io"
docker push ${IMAGE_TAG} docker push ${IMAGE_TAG}
@ -34,14 +43,24 @@ if [ -n "${TAG}" ]; then
ADDITIONAL_TAG="${REGISTRY}:${TAG}" ADDITIONAL_TAG="${REGISTRY}:${TAG}"
echo "Building the ${ADDITIONAL_TAG} image" echo "Building the ${ADDITIONAL_TAG} image"
if [ "$(uname -m)" = "s390x" ]; then
docker build \ case $(uname -m) in
--build-arg BASE_IMAGE_NAME=clefos \ aarch64)
--build-arg BASE_IMAGE_TAG=7 \ docker build \
--tag ${ADDITIONAL_TAG} . --build-arg BASE_IMAGE_NAME=docker.io/library/centos \
else --build-arg BASE_IMAGE_TAG=7 \
docker build --tag ${ADDITIONAL_TAG} . --tag ${ADDITIONAL_TAG} .
fi ;;
s390x)
docker build \
--build-arg BASE_IMAGE_NAME=docker.io/library/clefos \
--build-arg BASE_IMAGE_TAG=7 \
--tag ${ADDITIONAL_TAG} .
;;
*)
docker build --tag ${ADDITIONAL_TAG} .
;;
esac
echo "Pushing the image ${ADDITIONAL_TAG} to quay.io" echo "Pushing the image ${ADDITIONAL_TAG} to quay.io"
docker push ${ADDITIONAL_TAG} docker push ${ADDITIONAL_TAG}