fix: sql缺少字段补充、dockefile调整等

This commit is contained in:
meilin.huang
2024-10-24 11:56:22 +08:00
parent 2118acf244
commit 5e5afd49dc
6 changed files with 61 additions and 38 deletions

View File

@@ -1,43 +1,26 @@
# 构建前端资源
FROM node:18-bookworm-slim as fe-builder
ARG BASEIMAGES=m.daocloud.io/docker.io/alpine:3.20.2
WORKDIR /mayfly
FROM ${BASEIMAGES} AS builder
ARG TARGETARCH
COPY mayfly_go_web .
ARG MAYFLY_GO_VERSION
ARG MAYFLY_GO_DIR_NAME=mayfly-go-linux-${TARGETARCH}
ARG MAYFLY_GO_URL=https://gitee.com/dromara/mayfly-go/releases/download/${MAYFLY_GO_VERSION}/${MAYFLY_GO_DIR_NAME}.zip
RUN yarn config set registry 'https://registry.npmmirror.com' && \
yarn install && \
yarn build
RUN wget -cO mayfly-go.zip ${MAYFLY_GO_URL} && \
unzip mayfly-go.zip && \
mv ${MAYFLY_GO_DIR_NAME}/* /opt
# 构建后端资源
FROM golang:1.23 as be-builder
ENV GOPROXY https://goproxy.cn
WORKDIR /mayfly
FROM ${BASEIMAGES}
# Copy the go source for building server
COPY server .
RUN go mod tidy && go mod download
COPY --from=fe-builder /mayfly/dist /mayfly/static/static
# Build
RUN GO111MODULE=on CGO_ENABLED=0 GOOS=linux \
go build -a -ldflags=-w \
-o mayfly-go main.go
FROM debian:bookworm-slim
RUN apt-get update && \
apt-get install -y ca-certificates expat libncurses5 && \
apt-get clean
ENV TZ=Asia/Shanghai
ARG TZ=Asia/Shanghai
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
WORKDIR /mayfly
COPY --from=builder /opt/mayfly-go /usr/local/bin/mayfly-go
COPY --from=be-builder /mayfly/mayfly-go /usr/local/bin/mayfly-go
WORKDIR /mayfly-go
CMD ["mayfly-go"]
EXPOSE 18888
CMD ["mayfly-go"]