Merge branch 'main' into pr/Laisky/24

This commit is contained in:
Laisky.Cai
2025-01-17 02:56:35 +00:00
192 changed files with 5350 additions and 1942 deletions

View File

@@ -1,4 +1,4 @@
FROM --platform=$BUILDPLATFORM node:16 AS builder
FROM node:18 as builder
WORKDIR /web
COPY ./VERSION .
@@ -16,9 +16,12 @@ WORKDIR /web/air
RUN npm install
RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat ../VERSION) npm run build
FROM golang:alpine AS builder2
FROM golang:1.23.3-bullseye AS builder2
RUN apk add --no-cache g++
RUN apt-get update
RUN apt-get install -y --no-install-recommends g++ make gcc git build-essential ca-certificates \
&& update-ca-certificates 2>/dev/null || true \
&& rm -rf /var/lib/apt/lists/*
ENV GO111MODULE=on \
CGO_ENABLED=1 \
@@ -31,14 +34,14 @@ COPY . .
COPY --from=builder /web/build ./web/build
RUN go build -trimpath -ldflags "-s -w -X 'github.com/songquanpeng/one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api
FROM alpine
FROM debian:bullseye
RUN apk update \
&& apk upgrade \
&& apk add --no-cache ca-certificates tzdata \
&& update-ca-certificates 2>/dev/null || true
RUN apt-get update
RUN apt-get install -y --no-install-recommends ca-certificates haveged tzdata ffmpeg \
&& update-ca-certificates 2>/dev/null || true \
&& rm -rf /var/lib/apt/lists/*
COPY --from=builder2 /build/one-api /
EXPOSE 3000
WORKDIR /data
ENTRYPOINT ["/one-api"]
ENTRYPOINT ["/one-api"]