Skip to content

Commit e704733

Browse files
committed
build admin before dtm
1 parent 55e5a3b commit e704733

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

helper/Dockerfile-release

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
# COPY . .
66
# RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build
77

8-
FROM --platform=$TARGETPLATFORM golang:1.18-alpine as builder1
8+
FROM --platform=amd64 node as builder2
99
ARG TARGETARCH
1010
ARG TARGETOS
1111
ARG RELEASE_VERSION
1212
WORKDIR /app/dtm
13-
# RUN go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct
1413
COPY . .
15-
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w -X main.Version=$RELEASE_VERSION"
14+
RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build
1615

17-
FROM --platform=amd64 node as builder2
16+
FROM --platform=$TARGETPLATFORM golang:1.18-alpine as builder1
1817
ARG TARGETARCH
1918
ARG TARGETOS
2019
ARG RELEASE_VERSION
2120
WORKDIR /app/dtm
21+
# RUN go env -w GOPROXY=https://mirrors.aliyun.com/goproxy/,direct
2222
COPY . .
23-
RUN cd admin && yarn && VITE_ADMIN_VERSION=$RELEASE_VERSION yarn build
23+
COPY --from=builder2 /app/dtm/admin/dist /app/dtm/admin/dist
24+
RUN CGO_ENABLED=0 GOOS=$TARGETOS GOARCH=$TARGETARCH go build -ldflags="-s -w -X main.Version=$RELEASE_VERSION"
2425

2526
FROM --platform=$TARGETPLATFORM alpine
2627
COPY --from=builder1 /app/dtm/dtm /app/dtm/
27-
COPY --from=builder2 /app/dtm/admin/dist /app/dtm/admin/dist
2828
WORKDIR /app/dtm
2929
EXPOSE 8080
3030
ENTRYPOINT ["/app/dtm/dtm"]

0 commit comments

Comments
 (0)