From 5dbc6216fa75459f3af5c0ba7736ec3ec8ad7a0e Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 09:34:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
service/container_docker.go | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service/container_docker.go b/service/container_docker.go
index f456597..ca0de1b 100644
--- a/service/container_docker.go
+++ b/service/container_docker.go
@@ -55,7 +55,7 @@
Name string `json:"Name"`
Image string `json:"Image"`
State struct {
- Status string `json:"Status"`
+ Status string `json:"SalesReturnStatus"`
Running bool `json:"Running"`
} `json:"State"`
}
@@ -236,11 +236,11 @@
// if u.ParentId == "" { //鏄富璐﹀彿
// //鍒ゆ柇瀹瑰櫒鏄惁瀛樺湪鏃舵槸鍚﹂渶瑕佸姞閿侊紵鐢ㄦ埛娉ㄥ唽涓昏处鍙锋椂鏄紓姝ヨ姹傦紝鍒涘缓docker瀹瑰櫒娌℃湁鍐茬獊锛屽洜涓哄鍣ㄧ殑id涓嶅悓銆�
// //鎷夎捣瀹瑰櫒鍜岀敤鎴蜂富鍔ㄥ惎鍔ㄥ鍣ㄤ篃娌℃湁鏃堕棿鍐茬獊
- // _, e := slf.Exist(u.ID)
+ // _, e := slf.Exist(u.UUID)
// if e != ContainerNotFound {
// continue
// }
- // if err := slf.Init(u.ID); err != nil {
+ // if err := slf.Init(u.UUID); err != nil {
// logx.Errorf("init ContainerNotFound err:", err)
// }
// }
--
Gitblit v1.8.0