diff --git a/.github/actions/build-dev-builder-images/action.yml b/.github/actions/build-dev-builder-images/action.yml index 01d0368f98..119db791a7 100644 --- a/.github/actions/build-dev-builder-images/action.yml +++ b/.github/actions/build-dev-builder-images/action.yml @@ -41,6 +41,13 @@ runs: username: ${{ inputs.dockerhub-image-registry-username }} password: ${{ inputs.dockerhub-image-registry-token }} + - name: Set up qemu for multi-platform builds + uses: docker/setup-qemu-action@v3 + with: + platforms: linux/amd64,linux/arm64 + # The latest version will lead to segmentation fault. + image: tonistiigi/binfmt:qemu-v7.0.0-28 + - name: Build and push dev-builder-ubuntu image shell: bash if: ${{ inputs.build-dev-builder-ubuntu == 'true' }} diff --git a/Makefile b/Makefile index 5edfc0a1d7..27653093ca 100644 --- a/Makefile +++ b/Makefile @@ -145,7 +145,7 @@ docker-image-buildx: multi-platform-buildx ## Build docker image by buildx. .PHONY: dev-builder dev-builder: multi-platform-buildx ## Build dev-builder image. - docker buildx build --progress=plain --builder ${BUILDX_BUILDER_NAME} \ + docker buildx build --builder ${BUILDX_BUILDER_NAME} \ --build-arg="RUST_TOOLCHAIN=${RUST_TOOLCHAIN}" \ -f docker/dev-builder/${BASE_IMAGE}/Dockerfile \ -t ${IMAGE_REGISTRY}/${IMAGE_NAMESPACE}/dev-builder-${BASE_IMAGE}:${DEV_BUILDER_IMAGE_TAG} ${BUILDX_MULTI_PLATFORM_BUILD_OPTS} . diff --git a/docker/dev-builder/ubuntu/Dockerfile b/docker/dev-builder/ubuntu/Dockerfile index d93a8ebab1..198797b532 100644 --- a/docker/dev-builder/ubuntu/Dockerfile +++ b/docker/dev-builder/ubuntu/Dockerfile @@ -7,7 +7,7 @@ ENV LANG en_US.utf8 WORKDIR /greptimedb RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common + DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common # Install dependencies. RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ libssl-dev \