1808837298@qq.com 1 год назад
Родитель
Сommit
13d1b8203c
2 измененных файлов с 12 добавлено и 2 удалено
  1. 1 0
      .github/workflows/docker-image-arm64.yml
  2. 11 2
      Dockerfile

+ 1 - 0
.github/workflows/docker-image-arm64.yml

@@ -51,6 +51,7 @@ jobs:
           images: |
           images: |
             calciumion/new-api
             calciumion/new-api
             ghcr.io/${{ github.repository }}
             ghcr.io/${{ github.repository }}
+
       - name: Build and push Docker images
       - name: Build and push Docker images
         uses: docker/build-push-action@v3
         uses: docker/build-push-action@v3
         with:
         with:

+ 11 - 2
Dockerfile

@@ -7,18 +7,27 @@ COPY ./web .
 COPY ./VERSION .
 COPY ./VERSION .
 RUN DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$(cat VERSION) bun run build
 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 \
 ENV GO111MODULE=on \
     CGO_ENABLED=1 \
     CGO_ENABLED=1 \
     GOOS=linux
     GOOS=linux
 
 
 WORKDIR /build
 WORKDIR /build
+
 ADD go.mod go.sum ./
 ADD go.mod go.sum ./
 RUN go mod download
 RUN go mod download
+
 COPY . .
 COPY . .
 COPY --from=builder /build/dist ./web/dist
 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
 FROM alpine