From 20435fcbfc4df1e498fe3cfbefd00f96a7c2f682 Mon Sep 17 00:00:00 2001 From: JustSong Date: Sun, 9 Feb 2025 14:33:25 +0800 Subject: [PATCH] fix: simplify Docker build configuration by removing unnecessary platform and architecture settings --- .github/workflows/docker-image.yml | 6 ++---- Dockerfile | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 01c58947..9da1906a 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -62,9 +62,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . - platforms: ${{ contains(github.ref, 'alpha') && 'linux/amd64' || 'linux/amd64,linux/arm64' }} + platforms: ${{ contains(github.ref, 'alpha') && 'linux/amd64' || 'linux/amd64' }} push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - build-args: | - TARGETARCH=${{ startsWith(matrix.platform, 'linux/arm64') && 'arm64' || 'amd64' }} \ No newline at end of file + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index fc43cde2..346d9c5b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,7 @@ RUN apk add --no-cache \ ENV GO111MODULE=on \ CGO_ENABLED=1 \ - GOOS=linux \ - GOARCH=$TARGETARCH + GOOS=linux WORKDIR /build