From a083cc510a056d7f0659a181fa112a558155ad90 Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@qq.com>
Date: Wed, 10 Mar 2021 16:20:58 +0800
Subject: [PATCH] fix(build): DOCKER_CLI_EXPERIMENTAL=enabled

---
 scripts/docker_push.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
index 809b77568d..662a429050 100755
--- a/scripts/docker_push.sh
+++ b/scripts/docker_push.sh
@@ -51,6 +51,8 @@ DOCKER_DIR="$SRC_DIR/build/docker"
 
 # https://docs.docker.com/develop/develop-images/build_enhancements/
 export DOCKER_BUILDKIT=1
+# https://github.com/docker/buildx#with-buildx-or-docker-1903
+export DOCKER_CLI_EXPERIMENTAL=enabled
 
 REGISTRY=${REGISTRY:-docker.io/yunion}
 TAG=${TAG:-latest}
@@ -156,10 +158,10 @@ build_process_with_buildx() {
 general_build() {
     local component=$1
     # 如果未指定，则默认使用当前架构
-    local arch=${2:-$current_arch}
+    local arch=${2:-$CURRENT_ARCH}
     local is_all_arch=$3
 
-    if [[ "$current_arch" == "$arch" ]]; then
+    if [[ "$CURRENT_ARCH" == "$arch" ]]; then
         build_process $component $arch $is_all_arch
     else
         build_process_with_buildx $component $arch $is_all_arch