diff --git a/.github/workflows/docker-image-arm64.yml b/.github/workflows/docker-image-arm64.yml index 15d0af25..44aec807 100644 --- a/.github/workflows/docker-image-arm64.yml +++ b/.github/workflows/docker-image-arm64.yml @@ -51,6 +51,7 @@ jobs: images: | calciumion/new-api ghcr.io/${{ github.repository }} + - name: Build and push Docker images uses: docker/build-push-action@v3 with: diff --git a/Dockerfile b/Dockerfile index a7e378b3..4afb85f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,18 +7,27 @@ COPY ./web . COPY ./VERSION . RUN DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$(cat VERSION) bun run build -FROM golang AS builder2 +FROM golang:alpine AS builder2 + +RUN apk add --no-cache \ + gcc \ + musl-dev \ + sqlite-dev \ + build-base ENV GO111MODULE=on \ CGO_ENABLED=1 \ GOOS=linux WORKDIR /build + ADD go.mod go.sum ./ RUN go mod download + COPY . . COPY --from=builder /build/dist ./web/dist -RUN go build -ldflags "-s -w -X 'one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api +RUN go build -trimpath -ldflags "-s -w -X 'one-api/common.Version=$(cat VERSION)' -linkmode external -extldflags '-static'" -o one-api + FROM alpine