RISCV-64 support is available in alpine:latest as of v3.20

Signed-off-by: DL6ER <[email protected]>
pi-hole · Aug 30, 2024 · 77d792b · 77d792b
1 parent b63317e
commit 77d792b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/.github/workflows/ftl-build.yml b/.github/workflows/ftl-build.yml
@@ -85,8 +85,6 @@ jobs:
           target: tester
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            CONTAINER=alpine:${{ ( github.event_name == 'scheduled' || matrix.platform == 'linux/riscv64' ) && 'edge' || 'latest' }}
       -
         name: Push builder target and push by digest
         if: github.event_name != 'pull_request'
@@ -98,8 +96,6 @@ jobs:
           push: ${{ github.event_name != 'workflow_dispatch' }}
           target: builder
           labels: ${{ steps.meta.outputs.labels }}
-          build-args: |
-            CONTAINER=alpine:${{ ( github.event_name == 'scheduled' || matrix.platform == 'linux/riscv64' ) && 'edge' || 'latest' }}
           outputs: |
             type=image,name=${{ env.DOCKER_REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
             type=image,name=${{ env.GITHUB_REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true

diff --git a/ftl-build/Dockerfile b/ftl-build/Dockerfile
@@ -1,4 +1,4 @@
-ARG CONTAINER="alpine:edge"
+ARG CONTAINER="alpine:latest"
 FROM ${CONTAINER} AS builder
 
 ARG TARGETPLATFORM