From c677d8d1f3d2b0715d36dfc39f7c9f0e881fe32c Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 4 Jan 2024 13:28:57 +0100 Subject: [PATCH] Revert "build,docker: add support for riscv64" This reverts commit 765cffe6c2b7d0a9d757bbdb476cc0ea15fd287c. --- .github/workflows/docker-image.yml | 15 +-------------- mk/util.mk | 1 - 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 826bfad8509e..c1e77112d1d4 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -107,31 +107,18 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new - - name: Build Docker image (linux/riscv64) - uses: docker/build-push-action@v4 - with: - platforms: linux/riscv64 - context: . - push: false - load: true - file: ./Dockerfile - tags: ${{ env.IMAGE_NAME }}:linux-riscv64 - cache-from: type=local,src=/tmp/.buildx-cache - cache-to: type=local,dest=/tmp/.buildx-cache-new - # We test all the images on amd64 host here. This uses QEMU to emulate # the other platforms. - run: docker run --rm $IMAGE_NAME:linux-amd64 --version - run: docker run --rm $IMAGE_NAME:linux-arm-v7 --version - run: docker run --rm $IMAGE_NAME:linux-arm64-v8 --version - - run: docker run --rm $IMAGE_NAME:linux-riscv64 --version # This will only push the previously built images. - if: github.event_name != 'workflow_dispatch' || github.event.inputs.push == 'true' name: Publish to Docker Hub uses: docker/build-push-action@v4 with: - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/riscv64 + platforms: linux/amd64,linux/arm/v7,linux/arm64/v8 context: . push: true file: ./Dockerfile diff --git a/mk/util.mk b/mk/util.mk index 50040c17a6b5..2ce48583f568 100644 --- a/mk/util.mk +++ b/mk/util.mk @@ -16,7 +16,6 @@ SUPPORTED_PLATFORMS += linux-arm SUPPORTED_PLATFORMS += linux-arm64 SUPPORTED_PLATFORMS += linux-386 SUPPORTED_PLATFORMS += linux-amd64 -SUPPORTED_PLATFORMS += linux-riscv64 SUPPORTED_PLATFORMS += darwin-amd64 ifeq ($(shell bin/check_go_version "1.16.0" 2>/dev/null; echo $$?),0)