Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

后端dockerfile正确设置时区 && 忽略后端server/uploads文件夹 #1803

Merged
merged 38 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
1ecfcdc
点击跳转代码插件修复websotrm bug
xue-ding-e Apr 14, 2024
2365944
Merge branch 'flipped-aurora:main' into main
xue-ding-e Apr 17, 2024
1443ca4
Merge branch 'flipped-aurora:main' into main
xue-ding-e Apr 23, 2024
1c87570
Merge branch 'flipped-aurora:main' into main
xue-ding-e Apr 26, 2024
32087b8
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 9, 2024
5b905c9
自动化创建代码增加int64和uint(默认id类型)
xue-ding-e May 9, 2024
798d8b8
Merge pull request #2 from flipped-aurora/main
xue-ding-e May 10, 2024
0eba720
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 15, 2024
d18b91b
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 16, 2024
f93655d
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 16, 2024
9bd3062
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 21, 2024
92b9c4d
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 22, 2024
08f8e85
删除selectImage.vue中chooseImg下多余的console.log(url)
xue-ding-e May 24, 2024
ddc87a6
Revert "自动化创建代码增加int64和uint(默认id类型)"
xue-ding-e May 24, 2024
30bf327
Revert "删除selectImage.vue中chooseImg下多余的console.log(url)"
xue-ding-e May 26, 2024
1e0ba04
删除selectImage.vue中chooseImg下多余的console.log(url)
xue-ding-e May 26, 2024
af0196c
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 26, 2024
92a846c
Merge branch 'flipped-aurora:main' into main
xue-ding-e May 30, 2024
041a8f4
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 4, 2024
055f11c
增加package页面修改展示名字/描述内容
xue-ding-e Jun 4, 2024
1dce120
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 9, 2024
21ef799
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 11, 2024
95b5a2b
api筛选增加路径筛选
xue-ding-e Jun 12, 2024
8367e6d
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 12, 2024
9b43cd5
Merge remote-tracking branch 'origin/main'
xue-ding-e Jun 12, 2024
7912b06
Revert "增加package页面修改展示名字/描述内容"
xue-ding-e Jun 12, 2024
7e7334c
Merge branch 'qimiao'
xue-ding-e Jun 16, 2024
4fc0ae4
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 17, 2024
a8be66b
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 19, 2024
8c4cf39
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 21, 2024
497d188
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 23, 2024
e458d10
更改初始化角色名字
xue-ding-e Jun 23, 2024
0af8551
更改系统初始化用户角色名字
xue-ding-e Jun 23, 2024
3cc29a1
Revert "更改系统初始化用户角色名字"
xue-ding-e Jun 24, 2024
508b9b9
Revert "更改初始化角色名字"
xue-ding-e Jun 24, 2024
3459f03
dockerfile后端设置时区
xue-ding-e Jun 27, 2024
e0e3c70
Merge branch 'flipped-aurora:main' into main
xue-ding-e Jun 27, 2024
540b99c
gitignore忽略后端uploads文件夹
xue-ding-e Jun 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ rm_file/
/server/server
/server/latest_log
/server/__debug_bin*
server/uploads/

*.iml
web/.pnpm-debug.log
Expand Down
5 changes: 4 additions & 1 deletion server/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ RUN go env -w GO111MODULE=on \
FROM alpine:latest

LABEL MAINTAINER="SliverHorn@[email protected]"

# 设置时区
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 ./
Expand Down
Loading