chore: build-tool base for both arm64 & amd64 (#14751)

databendlabs · Feb 27, 2024 · 9d36698 · 9d36698
1 parent d164a00
commit 9d36698
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/.github/workflows/build_tool.yml b/.github/workflows/build_tool.yml
@@ -33,17 +33,16 @@ jobs:
           echo "TOOLCHAIN=${version}" >> $GITHUB_OUTPUT
 
       - name: Build and publish databend build base image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           pull: true
           push: true
           tags: |
             ${{ steps.login.outputs.dockerhub_repo }}:base
             ${{ steps.login.outputs.dockerhub_repo }}:base-${{ steps.toolchain.outputs.TOOLCHAIN }}
-            ${{ steps.login.outputs.ecr_repo }}:base
-            ${{ steps.login.outputs.ecr_repo }}:base-${{ steps.toolchain.outputs.TOOLCHAIN }}
           context: ./scripts/setup
           file: ./docker/build-tool/base/Dockerfile
+          platforms: linux/amd64,linux/arm64
 
   build:
     runs-on: ubuntu-latest
@@ -75,7 +74,7 @@ jobs:
           echo "TOOLCHAIN=${version}" >> $GITHUB_OUTPUT
 
       - name: Build and publish databend build image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           pull: true
           push: true
@@ -111,7 +110,7 @@ jobs:
           echo "TOOLCHAIN=${version}" >> $GITHUB_OUTPUT
 
       - name: Build and publish databend build base image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           pull: true
           push: true

diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml
@@ -98,7 +98,7 @@ jobs:
           short_sha=$(echo "${{ needs.info.outputs.sha }}" | cut -c1-7)
           echo "tag=pr-${{ github.event.pull_request.number }}-${short_sha}" >> $GITHUB_OUTPUT
       - name: push service image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: ${{ steps.login.outputs.ecr_repo }}:${{ steps.prepare.outputs.tag }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -365,7 +365,7 @@ jobs:
             core.setOutput('tags', tags.join(','));
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: ${{ steps.tags.outputs.tags }}
@@ -454,7 +454,7 @@ jobs:
             }
             core.setOutput('tags', tags.join(','));
       - name: push service image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           push: true
           tags: ${{ steps.tags.outputs.tags }}

diff --git a/docker/build-tool/musl/Dockerfile b/docker/build-tool/musl/Dockerfile
@@ -23,15 +23,6 @@ RUN ln -s ${MUSL_TARGET}-gcc /usr/local/bin/musl-gcc
 
 RUN rustup target add ${MUSL_RUST_TARGET}
 
-# HACK: To avoid the `undefined reference to pthread_getname_np` error during linking,
-# here we override set config environment var `je_cv_pthread_getname_np` to `no`,
-# as suggested by tikv-jemalloc-sys's maintainer @BusyJay:
-# https://github.com/tikv/jemallocator/issues/30#issuecomment-1183786410
-#
-# Hopefully this trick can be removed when rust upgraded to musl 1.2.3
-# https://github.com/rust-lang/rust/pull/102891
-ENV je_cv_pthread_getname_np no
-
 # needed by z3
 RUN ln -s ${MUSL_TARGET}-g++ /usr/local/bin/musl-g++
 RUN ln -s ${MUSL_TARGET}-ar /usr/local/bin/musl-ar