From aba3ce7976f32071afdf79736bb3bcdf205549ef Mon Sep 17 00:00:00 2001
From: erda-bot <81558540+erda-bot@users.noreply.github.com>
Date: Thu, 6 Jan 2022 16:54:47 +0800
Subject: [PATCH] support to specify image-tag (#3638) (#3642)

Co-authored-by: luobily <luobily@gmail.com>
---
 .erda/pipelines/ci-build-ce.yml | 3 ---
 build/scripts/docker_image.sh   | 2 +-
 pipeline.yml                    | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/.erda/pipelines/ci-build-ce.yml b/.erda/pipelines/ci-build-ce.yml
index f1ad91d92b4..974439630c5 100644
--- a/.erda/pipelines/ci-build-ce.yml
+++ b/.erda/pipelines/ci-build-ce.yml
@@ -35,7 +35,6 @@ stages:
             - mkdir -p extensions
             - cp -r ${{ dirs.erda-actions }} extensions
             - cp -r ${{ dirs.erda-addons }} extensions
-            - export VERSION=${{ outputs.extract-repo-version.version }}
             - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
             - make prepare
             - make build-push-all
@@ -53,7 +52,6 @@ stages:
           alias: build-agent
           commands:
             - cd ${{ dirs.erda }}
-            - export VERSION=${{ outputs.extract-repo-version.version }}
             - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
             - MODULE_PATH=cluster-agent make build-push-image
           loop:
@@ -70,7 +68,6 @@ stages:
       - release:
           alias: release-erda
           params:
-            tag_version: ${{ outputs.extract-repo-version.version }}
             check_diceyml: false
             cross_cluster: "true"
             dice_yml: ${{ dirs.erda }}/erda.yml
diff --git a/build/scripts/docker_image.sh b/build/scripts/docker_image.sh
index 0302e961306..db0dca2e962 100755
--- a/build/scripts/docker_image.sh
+++ b/build/scripts/docker_image.sh
@@ -31,7 +31,7 @@ cd $(git rev-parse --show-toplevel)
 
 # image version and url
 VERSION="$(build/scripts/make-version.sh)"
-IMAGE_TAG="$(build/scripts/make-version.sh tag)"
+IMAGE_TAG="${IMAGE_TAG:-$(build/scripts/make-version.sh tag)}"
 DOCKERFILE_DEFAULT="build/dockerfiles/Dockerfile"
 BASE_DOCKER_IMAGE="$(build/scripts/base_image.sh image)"
 DOCKERFILE=${DOCKERFILE_DEFAULT}
diff --git a/pipeline.yml b/pipeline.yml
index d3ffb54e1bb..1cdf9de1688 100644
--- a/pipeline.yml
+++ b/pipeline.yml
@@ -49,7 +49,6 @@ stages:
             - mkdir -p extensions
             - cp -r ${{ dirs.erda-actions }} extensions
             - cp -r ${{ dirs.erda-addons }} extensions
-            - export VERSION=${{ outputs.extract-repo-version.version }}
             - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
             - make prepare
             - make build-push-all
@@ -72,7 +71,6 @@ stages:
             - cp -r ${{ dirs.erda-addons }} extensions
             - cp -r ${{ dirs.erda-actions-enterprise }} extensions
             - cp -r ${{ dirs.erda-addons-enterprise }} extensions
-            - export VERSION=${{ outputs.extract-repo-version.version }}
             - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
             - make prepare
             - make build-push-image MODULE_PATH=dicehub
@@ -90,7 +88,6 @@ stages:
           alias: build-agent
           commands:
             - cd ${{ dirs.erda }}
-            - export VERSION=${{ outputs.extract-repo-version.version }}
             - export ERDA_VERSION=${{ outputs.extract-repo-version.major_minor_version }}
             - MODULE_PATH=cluster-agent make build-push-image
           loop: