From 2a47105af376e239a357107ea96f09c554ef11aa Mon Sep 17 00:00:00 2001
From: Jian Qiu <swordqiu@gmail.com>
Date: Sat, 25 Jun 2022 02:21:27 +0800
Subject: [PATCH] fix: upgrade go version to 1.16 for build docker images
 (#14526)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
---
 .circleci/config.yml         | 8 ++++----
 .github/workflows/docker.yml | 4 ++--
 Makefile.common.mk           | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 559505caf9..3e2490d5ce 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ version: 2
 jobs:
   check:
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunion/centos-build:1.1-6
         environment:
           ONECLOUD_CI_BUILD: "1"
     working_directory: /root/go/src/yunion.io/x/onecloud
@@ -18,7 +18,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunion/centos-build:1.1-6
         environment:
           ONECLOUD_CI_BUILD: "1"
 
@@ -38,7 +38,7 @@ jobs:
           command: |
             targets="$(circleci tests glob "cmd/*" | grep -v cmd/host-image | circleci tests split)"
             echo $targets | tr ' ' '\n'
-            make -j2 $targets
+            make $targets
             ls -lh _output/bin/
       - save_cache:
           key: onecloud-build-cache-{{ checksum "go.mod" }}-{{ checksum "Makefile" }}
@@ -51,7 +51,7 @@ jobs:
     requires:
       - check
     docker:
-      - image: yunionio/centos-build:1.1-4
+      - image: yunion/centos-build:1.1-6
         environment:
           ONECLOUD_CI_BUILD: "1"
     working_directory: /root/go/src/yunion.io/x/onecloud
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index b2f32e164f..d63385722b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,10 +17,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.14
+    - name: Set up Go 1.16
       uses: actions/setup-go@v1
       with:
-        go-version: 1.14
+        go-version: 1.16
       id: go
 
     - name: Check out code into the Go module directory
diff --git a/Makefile.common.mk b/Makefile.common.mk
index aad75b4292..a22cdc9feb 100644
--- a/Makefile.common.mk
+++ b/Makefile.common.mk
@@ -7,8 +7,8 @@ endif
 ModBaseName:=$(notdir $(ModName))
 
 DockerImageRegistry?=registry.cn-beijing.aliyuncs.com
-DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-5
-DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-5
+DockerImageAlpineBuild?=$(DockerImageRegistry)/yunionio/alpine-build:1.1-6
+DockerImageCentOSBuild?=$(DockerImageRegistry)/yunionio/centos-build:1.1-6
 
 
 EnvIf=$(if $($(1)),$(1)=$($(1)))