From 8c640ffad079365e485274672873123d7a412af4 Mon Sep 17 00:00:00 2001
From: Weiwei <weiwei.zhu@juicefs.io>
Date: Thu, 16 Nov 2023 14:51:57 +0800
Subject: [PATCH] fix: ci version (#799)

* ci: not build arm

Signed-off-by: zwwhdls <weiwei.zhu@juicefs.io>
---
 .github/workflows/version.yaml | 2 +-
 docker/Makefile                | 2 +-
 docker/csi.Dockerfile          | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
index ece45326de..85d49e3a89 100644
--- a/.github/workflows/version.yaml
+++ b/.github/workflows/version.yaml
@@ -62,7 +62,7 @@ jobs:
         if [ ${{ env.CSI_BUILD_VERSION }} ]; then
           echo "CSI_LATEST_VERSION=${{ env.CSI_BUILD_VERSION }}" >> $GITHUB_ENV
         else
-          CSI_LATEST_VERSION=$(shell git describe --tags --match 'v*' --always --dirty)
+          CSI_LATEST_VERSION=$(git describe --tags --match 'v*' | grep -oE 'v[0-9]+\.[0-9][0-9]*(\.[0-9]+)?')
           echo "CSI_LATEST_VERSION=$CSI_LATEST_VERSION" >> $GITHUB_ENV
         fi
     - name: Build docker images and push
diff --git a/docker/Makefile b/docker/Makefile
index 291cd75c8f..a68671ac1b 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -65,7 +65,7 @@ image-version:
         --build-arg JUICEFS_REPO_REF=$(CE_JUICEFS_VERSION) \
 		--build-arg JUICEFS_CE_MOUNT_IMAGE=$(JUICEFS_IMAGE):$(CE_VERSION) \
 		--build-arg JUICEFS_EE_MOUNT_IMAGE=$(JUICEFS_IMAGE):$(EE_VERSION) \
-		--platform linux/amd64,linux/arm64 -f csi.Dockerfile . --push
+		--platform linux/amd64 -f csi.Dockerfile . --push
 
 .PHONY: push-version
 push-version:
diff --git a/docker/csi.Dockerfile b/docker/csi.Dockerfile
index 36e37ba241..585de9d215 100644
--- a/docker/csi.Dockerfile
+++ b/docker/csi.Dockerfile
@@ -27,11 +27,11 @@ RUN bash -c "if [[ '${TARGETARCH}' == amd64 ]]; then mkdir -p /home/travis/.m2 &
     echo deb [arch=${TARGETARCH}] https://download.gluster.org/pub/gluster/glusterfs/10/LATEST/Debian/buster/${TARGETARCH}/apt buster main > /etc/apt/sources.list.d/gluster.list && \
     wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - && \
     echo deb https://download.ceph.com/debian-17.2.6/ bullseye main | tee /etc/apt/sources.list.d/ceph.list && \
-    apt-get update && apt-get install -y uuid-dev libglusterfs-dev glusterfs-common librados2 librados-dev; fi"
+    apt-get update && apt-get install -y uuid-dev libglusterfs-dev glusterfs-common librados2 librados-dev upx-ucl; fi"
 
 WORKDIR /workspace
 ENV GOPROXY=${GOPROXY:-https://proxy.golang.org}
-RUN apt-get update && apt-get install -y musl-tools upx-ucl && \
+RUN apt-get update && apt-get install -y musl-tools && \
     git clone https://github.com/juicedata/juicefs-csi-driver && \
     cd juicefs-csi-driver && git checkout $JUICEFS_CSI_REPO_REF && make && \
     cd /workspace && git clone --branch=$JUICEFS_REPO_BRANCH https://github.com/juicedata/juicefs && \
@@ -56,8 +56,8 @@ ENV JUICEFS_EE_MOUNT_IMAGE=${JUICEFS_EE_MOUNT_IMAGE}
 ADD https://github.com/krallin/tini/releases/download/v0.19.0/tini-${TARGETARCH} /tini
 RUN chmod +x /tini
 
-RUN apt update && apt install -y software-properties-common wget gnupg gnupg2 && apt update && \
-    bash -c "if [[ ${TARGETARCH} == amd64 ]]; then mkdir -p /home/travis/.m2 && \
+RUN apt update && \
+    bash -c "if [[ ${TARGETARCH} == amd64 ]]; then apt install -y software-properties-common wget gnupg gnupg2 && mkdir -p /home/travis/.m2 && \
     wget -O /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb https://github.com/apple/foundationdb/releases/download/6.3.23/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
     dpkg -i /home/travis/.m2/foundationdb-clients_6.3.23-1_${TARGETARCH}.deb && \
     wget -O - https://download.gluster.org/pub/gluster/glusterfs/10/rsa.pub | apt-key add - && \