diff --git a/Dockerfile b/Dockerfile index b21a7b3c..00d427bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,18 @@ FROM node:16 as builder -WORKDIR /build -COPY ./web . +WORKDIR /web/default +COPY web/default/package.json . +RUN npm install +COPY ./web/default . COPY ./VERSION . -RUN chmod u+x ./build.sh && ./build.sh +RUN GENERATE_SOURCEMAP='false' DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build + +WORKDIR /web/berry +COPY web/berry/package.json . +RUN npm install +COPY ./web/berry . +COPY ./VERSION . +RUN GENERATE_SOURCEMAP='false' DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build FROM golang AS builder2 @@ -15,7 +24,7 @@ WORKDIR /build ADD go.mod go.sum ./ RUN go mod download COPY . . -COPY --from=builder /build/build ./web/build +COPY --from=builder /web/build ./web/build RUN go build -ldflags "-s -w -X 'one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api FROM alpine @@ -28,4 +37,4 @@ RUN apk update \ COPY --from=builder2 /build/one-api / EXPOSE 3000 WORKDIR /data -ENTRYPOINT ["/one-api"] +ENTRYPOINT ["/one-api"] \ No newline at end of file