diff --git a/.gitignore b/.gitignore index e517c517a..5f7b8d380 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,7 @@ rm_file/ /server/server /server/latest_log /server/__debug_bin* +server/uploads/ *.iml web/.pnpm-debug.log diff --git a/server/Dockerfile b/server/Dockerfile index 545f70833..318ca1e2e 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -13,7 +13,10 @@ RUN go env -w GO111MODULE=on \ FROM alpine:latest LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com" - +# 设置时区 +ENV TZ=Asia/Shanghai +RUN apk update && apk add --no-cache tzdata openntpd \ + && ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone \ WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/server ./