feat: 0.1.3
1. 完善 dockerfile 和 entrypoint
This commit is contained in:
parent
b1b3ac5b6b
commit
9146c87cad
@ -1,2 +1,3 @@
|
|||||||
node_modules
|
frontend/node_modules
|
||||||
dist
|
dist
|
||||||
|
frontend/dist
|
@ -27,9 +27,12 @@ COPY --from=backend-builder /app/ushare /usr/local/bin/ushare
|
|||||||
# 配置 Nginx
|
# 配置 Nginx
|
||||||
RUN rm /etc/nginx/conf.d/default.conf
|
RUN rm /etc/nginx/conf.d/default.conf
|
||||||
COPY deployment/nginx.conf /etc/nginx/conf.d
|
COPY deployment/nginx.conf /etc/nginx/conf.d
|
||||||
|
COPY deployment/entrypoint.sh /usr/local/bin/entrypoint.sh
|
||||||
|
|
||||||
|
RUN chmod +x /usr/local/bin/entrypoint.sh
|
||||||
|
|
||||||
# 开放端口
|
# 开放端口
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
|
||||||
# 启动服务
|
# 启动服务
|
||||||
CMD ["sh", "-c", "nginx -g 'daemon off;' & exec ushare"]
|
ENTRYPOINT ["entrypoint.sh"]
|
35
deployment/entrypoint.sh
Normal file
35
deployment/entrypoint.sh
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# 启动后端服务(带参数后台运行)
|
||||||
|
echo "启动后端服务,参数: $@"
|
||||||
|
ushare "$@" &
|
||||||
|
BACKEND_PID=$!
|
||||||
|
|
||||||
|
# 定义优雅关闭函数
|
||||||
|
graceful_shutdown() {
|
||||||
|
echo "接收到终止信号,开始优雅关闭..."
|
||||||
|
|
||||||
|
# 先关闭 Nginx
|
||||||
|
echo "关闭 Nginx..."
|
||||||
|
nginx -s quit 2>/dev/null || kill -TERM $NGINX_PID 2>/dev/null
|
||||||
|
|
||||||
|
# 关闭后端服务
|
||||||
|
echo "关闭后端服务 PID $BACKEND_PID..."
|
||||||
|
kill -TERM $BACKEND_PID 2>/dev/null
|
||||||
|
|
||||||
|
# 等待进程终止
|
||||||
|
wait $BACKEND_PID $NGINX_PID 2>/dev/null
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# 捕获系统信号
|
||||||
|
trap 'graceful_shutdown' SIGTERM SIGINT
|
||||||
|
|
||||||
|
# 启动 Nginx(前台运行)
|
||||||
|
echo "启动 Nginx..."
|
||||||
|
nginx -g "daemon off;" &
|
||||||
|
NGINX_PID=$!
|
||||||
|
|
||||||
|
# 等待所有后台进程
|
||||||
|
wait $BACKEND_PID $NGINX_PID
|
@ -104,6 +104,10 @@ func (m *meta) Start(ctx context.Context) {
|
|||||||
ticker := time.NewTicker(time.Minute)
|
ticker := time.NewTicker(time.Minute)
|
||||||
m.ctx = ctx
|
m.ctx = ctx
|
||||||
|
|
||||||
|
if err := os.MkdirAll(opt.Cfg.DataPath, 0644); err != nil {
|
||||||
|
log.Fatal("controller.MetaManager.Start: mkdir datapath failed, path = %s, err = %s", opt.Cfg.DataPath, err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
// 清理 2 分钟内没有继续上传的 part
|
// 清理 2 分钟内没有继续上传的 part
|
||||||
go func() {
|
go func() {
|
||||||
for {
|
for {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user