Merge branch 'UGREEN-DEV' into UGREEN

2.0正式发布
onlyLTY · Jan 30, 2024 · 4ad0d8a · 4ad0d8a
2 parents 2a457cb + 158e7c4
commit 4ad0d8a
Show file tree

Hide file tree

Showing 15 changed files with 79 additions and 71 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -14,7 +14,9 @@ RUN chmod +x start.sh
 # 设置环境变量
 ENV secretKey="" \
     hubURL="https://docker.nju.edu.cn" \
-    DOCKER_HOST="tcp://127.0.0.1:9375"
+    DOCKER_HOST="tcp://127.0.0.1:9375" \
+    TZ="Asia/Shanghai"
 
+VOLUME ["/data"]
 # 设置启动命令
 CMD ["./start.sh"]
diff --git a/dockercopilot.go b/dockercopilot.go
@@ -40,8 +40,8 @@ func main() {
 	var c config.Config
 	err := conf.Load(*configFile, &c, conf.UseEnv())
 	if err != nil {
-		logx.Errorf("无法加载配置文件: %v", err)
-		logx.Error("请重新拉取镜像")
+		logx.Errorf("无法加载配置文件出错: %v", err)
+		logx.Errorf("请确认secretKey设置正确，要求非纯数字且大于八位")
 		os.Exit(1)
 	}
 	server := rest.MustNewServer(c.RestConf, rest.WithCors("*"), rest.WithUnauthorizedCallback(

diff --git a/internal/module/checkupdate.go b/internal/module/checkupdate.go
@@ -32,6 +32,9 @@ func NewImageCheck() *ImageUpdateData {
 }
 func (i *ImageUpdateData) CheckUpdate(imageList []types.Image) {
 	for _, image := range imageList {
+		if strings.Contains(image.ImageName, "0nlylty/dockercopilot") {
+			continue
+		}
 		i.checkSingleImage(image)
 	}
 }

diff --git a/internal/utiles/updatecontainer.go b/internal/utiles/updatecontainer.go
@@ -42,27 +42,10 @@ func UpdateContainer(ctx *svc.ServiceContext, id string, name string, imageNameA
 	}
 	timeout := 10
 	signal := "SIGINT"
-	oldTaskProgress.Message = "正在停止容器"
-	oldTaskProgress.Percentage = 10
-	oldTaskProgress.DetailMsg = "正在停止容器"
-	ctx.UpdateProgress(taskID, oldTaskProgress)
-	stopOptions := container.StopOptions{
-		Signal:  signal,
-		Timeout: &timeout,
-	}
-	err = cli.ContainerStop(context.Background(), id, stopOptions)
-	if err != nil {
-		oldTaskProgress.Message = "停止容器失败"
-		oldTaskProgress.DetailMsg = err.Error()
-		oldTaskProgress.IsDone = true
-		ctx.UpdateProgress(taskID, oldTaskProgress)
-		return err
-	}
-	oldTaskProgress.Message = "容器停止成功"
-	oldTaskProgress.DetailMsg = "容器停止成功"
-	oldTaskProgress.Percentage = 20
+
 	ctx.UpdateProgress(taskID, oldTaskProgress)
 	oldTaskProgress.Message = "正在拉取新镜像"
+	oldTaskProgress.Percentage = 10
 	oldTaskProgress.DetailMsg = "正在拉取新镜像"
 	ctx.UpdateProgress(taskID, oldTaskProgress)
 	cli.NegotiateAPIVersion(context.TODO())
@@ -94,6 +77,26 @@ func UpdateContainer(ctx *svc.ServiceContext, id string, name string, imageNameA
 	}
 	oldTaskProgress.Message = "拉取镜像成功"
 	oldTaskProgress.DetailMsg = "拉取镜像成功"
+
+	oldTaskProgress.Percentage = 30
+	oldTaskProgress.Message = "正在停止容器"
+	oldTaskProgress.DetailMsg = "正在停止容器"
+	ctx.UpdateProgress(taskID, oldTaskProgress)
+	stopOptions := container.StopOptions{
+		Signal:  signal,
+		Timeout: &timeout,
+	}
+	err = cli.ContainerStop(context.Background(), id, stopOptions)
+	if err != nil {
+		oldTaskProgress.Message = "停止容器失败"
+		oldTaskProgress.DetailMsg = err.Error()
+		oldTaskProgress.IsDone = true
+		ctx.UpdateProgress(taskID, oldTaskProgress)
+		return err
+	}
+	oldTaskProgress.Message = "容器停止成功"
+	oldTaskProgress.DetailMsg = "容器停止成功"
+
 	oldTaskProgress.Percentage = 40
 	ctx.UpdateProgress(taskID, oldTaskProgress)
 	oldTaskProgress.Message = "正在重命名旧容器"

diff --git a/static/asset/background.jpeg b/static/asset/background.jpeg
diff --git a/static/asset/wechat.jpg b/static/asset/wechat.jpg
diff --git a/static/asset/zhifubao.png b/static/asset/zhifubao.png
diff --git a/templates/assets/alipay-TMOwxqHJ.jpg b/templates/assets/alipay-TMOwxqHJ.jpg
diff --git a/templates/assets/index-kaKYJjmE.css → templates/assets/index--2ghzEOJ.css b/templates/assets/index-kaKYJjmE.css → templates/assets/index--2ghzEOJ.css
diff --git a/templates/assets/index--Dy0IwWW.js → templates/assets/index-AL90eS9R.js b/templates/assets/index--Dy0IwWW.js → templates/assets/index-AL90eS9R.js
diff --git a/templates/assets/wechat-GYCIcvb-.jpg b/templates/assets/wechat-GYCIcvb-.jpg
diff --git a/templates/assets/wechat-pDGSdncv.jpg b/templates/assets/wechat-pDGSdncv.jpg
diff --git a/templates/assets/zhifubao-49yYrDNg.png b/templates/assets/zhifubao-49yYrDNg.png
diff --git a/templates/index.html b/templates/index.html
@@ -5,8 +5,8 @@
     <link rel="icon" type="image/svg+xml" href="/manager/dockerCopilotLogo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>docker copilot</title>
-    <script type="module" crossorigin src="/manager/assets/index--Dy0IwWW.js"></script>
-    <link rel="stylesheet" crossorigin href="/manager/assets/index-kaKYJjmE.css">
+    <script type="module" crossorigin src="/manager/assets/index-AL90eS9R.js"></script>
+    <link rel="stylesheet" crossorigin href="/manager/assets/index--2ghzEOJ.css">
   </head>
   <body>
     <div id="root"></div>

diff --git a/version b/version
@@ -1 +1 @@
-v1.0.3-UGREEN
+v2.0.0-UGREEN