From 9a15640e8ed1153cd8c381fc302d391ff46bf2f6 Mon Sep 17 00:00:00 2001
From: Lan Liang <gcslyp@gmail.com>
Date: Tue, 29 Aug 2023 09:04:40 +0000
Subject: [PATCH] fix docker build

Signed-off-by: Lan Liang <gcslyp@gmail.com>
---
 .github/workflows/ci.yaml           | 21 +++++++++++++++++++++
 .github/workflows/docker-image.yaml | 15 +++++++++++++++
 Dockerfile                          |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 .github/workflows/docker-image.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1189952966..ccaf1dbb56 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -32,6 +32,27 @@ jobs:
         with:
           config: ./typos.toml
 
+  docker-build:
+    runs-on: ubuntu-18.04
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+      - name: Setup Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VERSION }}
+      - name: Cache Go Dependencies
+        uses: actions/cache@v2
+        with:
+          path: ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: ${{ runner.os }}-go-
+      - name: build
+        run: |
+          make docker-build
+
   golangci-lint:
     runs-on: ubuntu-18.04
     steps:
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
new file mode 100644
index 0000000000..0907ac09b4
--- /dev/null
+++ b/.github/workflows/docker-image.yaml
@@ -0,0 +1,15 @@
+name: Docker Image CI
+
+on:
+  workflow_dispatch:
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - name: Build the Docker image
+        run: IMG=openkruise/kruise-manager:${{ github.ref_name }} & make docker-multiarch
diff --git a/Dockerfile b/Dockerfile
index 30742a4675..04ae2035b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ ARG BASE_IMAGE
 ARG BASE_IMAGE_VERSION
 FROM ${BASE_IMAGE}:${BASE_IMAGE_VERSION}
 
-RUN apk add --no-cache ca-certificates=~20220614-r4 bash=~5.2.15-r0 expat=~2.5.0-r0 \
+RUN apk add --no-cache ca-certificates bash expat \
   && rm -rf /var/cache/apk/*
 
 WORKDIR /