optimize image retag

Signed-off-by: iutx <[email protected]>
erda-project · Jan 31, 2024 · 2e1e172 · 2e1e172
1 parent 353d454
commit 2e1e172
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/build/scripts/docker_image.sh b/build/scripts/docker_image.sh
@@ -34,7 +34,6 @@ cd $(git rev-parse --show-toplevel)
 ARCH="${ARCH:-$(go env GOARCH)}"
 VERSION="$(build/scripts/make-version.sh)"
 IMAGE_TAG="${IMAGE_TAG:-$(build/scripts/make-version.sh tag)}"
-IMAGE_TAG_WITH_ARCH="${IMAGE_TAG:-$(build/scripts/make-version.sh tag)}-${ARCH}"
 DOCKERFILE_DEFAULT="build/dockerfiles/Dockerfile"
 BASE_DOCKER_IMAGE="registry.erda.cloud/erda/erda-base:20230811"
 DOCKERFILE=${DOCKERFILE_DEFAULT}
@@ -52,8 +51,8 @@ setup_single_module_env() {
     elif [ -d "build/dockerfiles/${APP_NAME}" ];then
         DOCKERFILE="build/dockerfiles/${APP_NAME}/Dockerfile"
     fi
-    DOCKER_IMAGE="${APP_NAME}:${IMAGE_TAG_WITH_ARCH}"
-    IMAGE_TAG="${IMAGE_TAG_WITH_ARCH}"
+    IMAGE_TAG="${IMAGE_TAG}-${ARCH}"
+    DOCKER_IMAGE="${APP_NAME}:${IMAGE_TAG}"
 }
 
 # setup envionment variables for build all