fix: docker buildx

Signed-off-by: zwwhdls <[email protected]>
juicedata · Nov 20, 2023 · 5c1431d · 5c1431d
1 parent 17708e7
commit 5c1431d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/juicefs-image.yaml b/.github/workflows/juicefs-image.yaml
@@ -153,9 +153,9 @@ jobs:
           image_exist=${{ env.MOUNT_IMAGE_EXIST }}
           if [ $image_exist == "false" ]; then
             echo "Build JuiceFS new version image"
-            export DOCKER_CLI_EXPERIMENTAL=enabled
-            docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
-            docker buildx create --use --name mybuilder
+#            export DOCKER_CLI_EXPERIMENTAL=enabled
+#            docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
+#            docker buildx create --use --name mybuilder
             make -C docker ee-image
             make -C docker fuse-ee-image
           else

diff --git a/.github/workflows/version.yaml b/.github/workflows/version.yaml
@@ -73,9 +73,9 @@ jobs:
         CSIVERSION: ${{ env.CSI_LATEST_VERSION }}
         DASHBOARD_TAG: ${{ env.CSI_LATEST_VERSION }}
       run: |
-        export DOCKER_CLI_EXPERIMENTAL=enabled
-        docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
-        docker buildx create --use --name mybuilder
+#        export DOCKER_CLI_EXPERIMENTAL=enabled
+#        docker run --rm --privileged docker/binfmt:66f9012c56a8316f9244ffd7622d7c21c1f6f28d
+#        docker buildx create --use --name mybuilder
         make -C docker image-version
         make -C docker dashboard-buildx
     - name: Setup upterm session

diff --git 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 -f csi.Dockerfile . --push
+		--platform linux/amd64,linux/arm64 -f csi.Dockerfile . --push
 
 .PHONY: push-version
 push-version: