From c1cf728995d06cc32e0583b450d7a5628d392482 Mon Sep 17 00:00:00 2001
From: wanyaoqi <wanyaoqi@yunionyun.com>
Date: Wed, 26 Aug 2020 13:21:34 +0800
Subject: [PATCH] fix github action workflow (#7635)

---
 .github/workflows/docker.yml  | 11 +---------
 Makefile                      |  2 +-
 build/docker/Dockerfile.climc |  2 +-
 scripts/docker_push.sh        | 40 ++++++++++++++++++-----------------
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0a2bd1c522..b2f32e164f 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -30,17 +30,8 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install librados-dev librbd-dev # baremetal-agent needs this
-        make cmd/apigateway cmd/climc cmd/keystone
-        make cmd/logger cmd/region cmd/scheduler cmd/webconsole
-        make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway
-        make cmd/ansibleserver cmd/cloudnet cmd/notify
-        make cmd/host-deployer && ./scripts/bundle_libraries.sh _output/bin/bundles/host-deployer _output/bin/host-deployer
         make cmd/baremetal-agent && ./scripts/bundle_libraries.sh _output/bin/bundles/baremetal-agent _output/bin/baremetal-agent
-        make cmd/cloudevent cmd/devtool cmd/cloudid
-        make cmd/*cli
-        make cmd/esxi-agent
-        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns'
-
+        make docker-alpine-build F='-j4 cmd/host cmd/vpcagent cmd/region-dns make cmd/apigateway cmd/climc cmd/keystone make cmd/logger cmd/region cmd/scheduler cmd/webconsole make cmd/yunionconf cmd/glance cmd/torrent cmd/s3gateway make cmd/ansibleserver cmd/cloudnet cmd/notify make cmd/host-deployer make cmd/cloudevent cmd/devtool cmd/cloudid make cmd/*cli make cmd/esxi-agent'
     - name: Image region
       uses: elgohr/Publish-Docker-Github-Action@master
       with:
diff --git a/Makefile b/Makefile
index 5b7e0e72ec..83e831676a 100644
--- a/Makefile
+++ b/Makefile
@@ -232,7 +232,7 @@ docker-centos-build-stop:
 .PHONY: docker-centos-build
 .PHONY: docker-centos-build-stop
 
-DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-2
+DOCKER_ALPINE_BUILD_IMAGE?=registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3
 
 define dockerAlpineBuildCmd
 set -o xtrace
diff --git a/build/docker/Dockerfile.climc b/build/docker/Dockerfile.climc
index fc1db4e5ac..198ed5ad9f 100644
--- a/build/docker/Dockerfile.climc
+++ b/build/docker/Dockerfile.climc
@@ -2,4 +2,4 @@ FROM registry.cn-beijing.aliyuncs.com/yunionio/climc-base:20200820
 
 ADD ./build/climc/root/opt /opt
 
-ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/climc
+ADD ./_output/alpine-build/bin/climc ./_output/alpine-build/bin/*cli /opt/yunion/bin/
diff --git a/scripts/docker_push.sh b/scripts/docker_push.sh
index 4a43d958de..d8076e8079 100755
--- a/scripts/docker_push.sh
+++ b/scripts/docker_push.sh
@@ -34,25 +34,27 @@ REGISTRY=${REGISTRY:-docker.io/yunion}
 TAG=${TAG:-latest}
 
 build_bin() {
-  local BUILD_ARCH=$2
-  local BUILD_CC=$3
-  local BUILD_CGO=$4
-	case "$1" in
-		climc)
-			docker run --rm \
-				-v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
-				-v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
-				registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 \
-				/bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CC $BUILD_CGO GOOS=linux make cmd/$1 cmd/*cli; chown -R $(id -u):$(id -g) _output"
-			;;
-		*)
-			docker run --rm \
-				-v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
-				-v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
-				registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 \
-				/bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CC $BUILD_CGO GOOS=linux make cmd/$1; chown -R $(id -u):$(id -g) _output"
-			;;
-	esac
+    local BUILD_ARCH=$2
+    local BUILD_CC=$3
+    local BUILD_CGO=$4
+    case "$1" in
+        climc)
+            docker run --rm \
+                -v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
+                -v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
+                -v $SRC_DIR/_output/alpine-build/_cache:/root/.cache \
+                registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 \
+                /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CC $BUILD_CGO GOOS=linux make cmd/$1 cmd/*cli; chown -R $(id -u):$(id -g) _output"
+            ;;
+        *)
+            docker run --rm \
+                -v $SRC_DIR:/root/go/src/yunion.io/x/onecloud \
+                -v $SRC_DIR/_output/alpine-build:/root/go/src/yunion.io/x/onecloud/_output \
+                -v $SRC_DIR/_output/alpine-build/_cache:/root/.cache \
+                registry.cn-beijing.aliyuncs.com/yunionio/alpine-build:1.0-3 \
+                /bin/sh -c "set -ex; cd /root/go/src/yunion.io/x/onecloud; $BUILD_ARCH $BUILD_CC $BUILD_CGO GOOS=linux make cmd/$1; chown -R $(id -u):$(id -g) _output"
+            ;;
+    esac
 }