diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b4e891b..a025e05 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -24,6 +24,12 @@ jobs: run: | git describe --tags > VERSION + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Log in to Docker Hub uses: docker/login-action@v2 with: @@ -49,6 +55,7 @@ jobs: uses: docker/build-push-action@v3 with: context: . + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 44ff3fd..7b2dc9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,8 @@ FROM golang AS builder2 ENV GO111MODULE=on \ CGO_ENABLED=1 \ - GOOS=linux \ - GOARCH=amd64 + GOOS=linux + WORKDIR /build COPY . . COPY --from=builder /build/build ./web/build