From a854355bea0c727c490dd54565f1c5124ad083df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 10 Mar 2023 15:54:29 +0100 Subject: [PATCH] kata-deploy: Use more descriptive names for IMG_{TAG,NAME} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On main we're using BASE_IMAGE_TAG and BASE_IMAGE_NAME to avoid any kind of confusion. Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy-cc/Dockerfile | 6 +++--- .../local-build/kata-deploy-build-and-upload-payload.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/packaging/kata-deploy-cc/Dockerfile b/tools/packaging/kata-deploy-cc/Dockerfile index 5b78ea41c2..b466551b6d 100644 --- a/tools/packaging/kata-deploy-cc/Dockerfile +++ b/tools/packaging/kata-deploy-cc/Dockerfile @@ -3,9 +3,9 @@ # SPDX-License-Identifier: Apache-2.0 # Specify alternative base image, e.g. clefos for s390x -ARG IMG_NAME=registry.centos.org/centos -ARG IMG_TAG=7 -FROM $IMG_NAME:$IMG_TAG +ARG BASE_IMAGE_NAME=registry.centos.org/centos +ARG BASE_IMAGE_TAG=7 +FROM $BASE_IMAGE_NAME:$BASE_IMAGE_TAG ARG KATA_ARTIFACTS=./kata-static.tar.xz ARG DESTINATION=/opt/kata-artifacts diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh index 221a847531..ec7438c691 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-build-and-upload-payload.sh @@ -20,8 +20,8 @@ IMAGE_TAG="${REGISTRY}:kata-containers-$(git rev-parse HEAD)-$(uname -m)" echo "Building the image" if [ "$(uname -m)" = "s390x" ]; then docker build \ - --build-arg IMG_NAME=clefos \ - --build-arg IMG_TAG=7 \ + --build-arg BASE_IMAGE_NAME=clefos \ + --build-arg BASE_IMAGE_TAG=7 \ --tag ${IMAGE_TAG} . else docker build --tag ${IMAGE_TAG} .