diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 5ed944ec3..329ce2100 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -76,4 +76,4 @@ jobs: - name: Build the Docker image use package_json version if: ${{ github.event_name == 'push' || github.event.inputs.image_tag == '' }} run: | - docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:latest -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:v${{ steps.version.outputs.value }} . + docker buildx build --push --platform linux/amd64,linux/arm64 -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:latest -t ${{ env.docker_hub_owner }}/${{ env.docker_hub_repo }}:v${{ steps.version.outputs.value }} . diff --git a/Dockerfile b/Dockerfile index 6059bfef5..e41085d89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get purge -y jq RUN apt-get autoremove -y RUN rm -rf /var/lib/apt/lists/* -FROM golang:alpine AS GO_BUILD +FROM golang:1.24-alpine AS GO_BUILD WORKDIR /go/src/github.com/siyuan-note/siyuan/ COPY --from=NODE_BUILD /go/src/github.com/siyuan-note/siyuan/ /go/src/github.com/siyuan-note/siyuan/ ENV GO111MODULE=on