github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 12:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6402 from fidencio/topic/yet-more-fixes-for-the-publish-kata-deploy-payload-work

Browse Source 
workflows: Yet more fixes for publishing the kata-deploy payload after every PR merged
This commit is contained in:
Fabiano Fidêncio
2023-03-06 10:43:32 +01:00
committed by GitHub
parent df35f8f885 9bc7bef3d6
commit 93a40cb35e
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/packaging/kata-deploy/Dockerfile
View File

@@ -3,8 +3,9 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# Specify alternative base image, e.g. clefos for s390x # Specify alternative base image, e.g. clefos for s390x
ARG IMAGE ARG BASE_IMAGE_NAME=registry.centos.org/centos
FROM ${IMAGE:-registry.centos.org/centos}:7 ARG BASE_IMAGE_TAG=7
FROM $BASE_IMAGE_NAME:$BASE_IMAGE_TAG
ARG KATA_ARTIFACTS=./kata-static.tar.xz ARG KATA_ARTIFACTS=./kata-static.tar.xz
ARG DESTINATION=/opt/kata-artifacts ARG DESTINATION=/opt/kata-artifacts

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

@@ -5,7 +5,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
KATA_DEPLOY_DIR="`dirname ${0}`/../../kata-deploy-cc" KATA_DEPLOY_DIR="`dirname ${0}`/../../kata-deploy"
KATA_DEPLOY_ARTIFACT="${1:-"kata-static.tar.xz"}" KATA_DEPLOY_ARTIFACT="${1:-"kata-static.tar.xz"}"
REGISTRY="${2:-"quay.io/kata-containers/kata-deploy"}" REGISTRY="${2:-"quay.io/kata-containers/kata-deploy"}"
TAG="${3:-}" TAG="${3:-}"
@@ -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 IMG_NAME=clefos \ docker build \
--build-arg IMG_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 IMG_NAME=clefos \ aarch64)
--build-arg IMG_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}