From 77d792ba9014c6c24659e10856efb60bc061eb33 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Fri, 30 Aug 2024 20:54:06 +0200 Subject: [PATCH] RISCV-64 support is available in alpine:latest as of v3.20 Signed-off-by: DL6ER --- .github/workflows/ftl-build.yml | 4 ---- ftl-build/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ftl-build.yml b/.github/workflows/ftl-build.yml index c61a988..83bb323 100644 --- 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 index e969557..30316e9 100644 --- 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