From 00e8df22ba285685b11d217fdcb4cd7a52e32ba5 Mon Sep 17 00:00:00 2001 From: Wei Zhang Date: Tue, 16 Aug 2022 22:22:51 +0800 Subject: [PATCH] built: :hammer: keep v prefix in DOCKER_IMAGE_TAG env (#781) Signed-off-by: WeiZhang Signed-off-by: WeiZhang --- base-images/build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/base-images/build.sh b/base-images/build.sh index 7817d76ee..9542aa7d7 100755 --- a/base-images/build.sh +++ b/base-images/build.sh @@ -6,7 +6,7 @@ ROOT_DIR=`dirname $0` GIT_TAG_VERSION=$(git describe --tags --abbrev=0 | sed -r 's/[v]+//g') # remove v from version ENVD_VERSION="${ENVD_VERSION:-$GIT_TAG_VERSION}" -DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG:-$ENVD_VERSION}" +DOCKER_IMAGE_TAG="${DOCKER_IMAGE_TAG:-v$ENVD_VERSION}" DOCKER_HUB_ORG="${DOCKER_HUB_ORG:-tensorchord}" PYTHON_VERSION="${PYTHON_VERSION:-3.9}" ENVD_OS="${ENVD_OS:-ubuntu20.04}" @@ -26,26 +26,26 @@ docker buildx build \ --build-arg ENVD_VERSION=${ENVD_VERSION} \ --build-arg ENVD_SSH_IMAGE=ghcr.io/tensorchord/envd-ssh-from-scratch \ --pull --push --platform linux/x86_64,linux/arm64 \ - -t ${DOCKER_HUB_ORG}/python:${PYTHON_VERSION}-${ENVD_OS}-envd-v${DOCKER_IMAGE_TAG} \ + -t ${DOCKER_HUB_ORG}/python:${PYTHON_VERSION}-${ENVD_OS}-envd-${DOCKER_IMAGE_TAG} \ -f python${PYTHON_VERSION}-${ENVD_OS}.Dockerfile . docker buildx build --build-arg IMAGE_NAME=docker.io/nvidia/cuda \ --build-arg ENVD_VERSION=${ENVD_VERSION} \ --build-arg ENVD_SSH_IMAGE=ghcr.io/tensorchord/envd-ssh-from-scratch \ --pull --push --platform linux/x86_64,linux/arm64 \ - -t ${DOCKER_HUB_ORG}/python:${PYTHON_VERSION}-${ENVD_OS}-cuda11.6-cudnn8-envd-v${DOCKER_IMAGE_TAG} \ + -t ${DOCKER_HUB_ORG}/python:${PYTHON_VERSION}-${ENVD_OS}-cuda11.6-cudnn8-envd-${DOCKER_IMAGE_TAG} \ -f python${PYTHON_VERSION}-${ENVD_OS}-cuda11.6.Dockerfile . # TODO(gaocegege): Support linux/arm64 docker buildx build \ --build-arg ENVD_VERSION=${ENVD_VERSION} \ --build-arg ENVD_SSH_IMAGE=ghcr.io/tensorchord/envd-ssh-from-scratch \ - -t ${DOCKER_HUB_ORG}/r-base:${RLANG_VERSION}-envd-v${DOCKER_IMAGE_TAG} \ + -t ${DOCKER_HUB_ORG}/r-base:${RLANG_VERSION}-envd-${DOCKER_IMAGE_TAG} \ --pull --push --platform linux/x86_64 \ -f r${RLANG_VERSION}.Dockerfile . docker buildx build \ --build-arg ENVD_VERSION=${ENVD_VERSION} \ --build-arg ENVD_SSH_IMAGE=ghcr.io/tensorchord/envd-ssh-from-scratch \ - -t ${DOCKER_HUB_ORG}/julia:${JULIA_VERSION}-${ENVD_OS}-envd-v${DOCKER_IMAGE_TAG} \ + -t ${DOCKER_HUB_ORG}/julia:${JULIA_VERSION}-${ENVD_OS}-envd-${DOCKER_IMAGE_TAG} \ --pull --push --platform linux/x86_64,linux/arm64 \ -f julia${JULIA_VERSION}-${ENVD_OS}.Dockerfile . cd - > /dev/null