From 2cfd5a26a94a2dd589ad7be4379bcf0a523cb994 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Wed, 28 Jan 2026 07:46:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9docker=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/apps/docker/app.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/internal/apps/docker/app.go b/internal/apps/docker/app.go index 350fba08..a188f537 100644 --- a/internal/apps/docker/app.go +++ b/internal/apps/docker/app.go @@ -60,10 +60,8 @@ func (s *App) UpdateConfig(w http.ResponseWriter, r *http.Request) { func (s *App) GetSettings(w http.ResponseWriter, r *http.Request) { configPath := "/etc/docker/daemon.json" - // 读取配置文件 content, err := io.Read(configPath) if err != nil { - // 如果文件不存在,返回默认设置 if os.IsNotExist(err) { service.Success(w, Settings{}) return @@ -72,14 +70,12 @@ func (s *App) GetSettings(w http.ResponseWriter, r *http.Request) { return } - // 解析 JSON var daemonConfig DaemonConfig if err = json.Unmarshal([]byte(content), &daemonConfig); err != nil { - service.Error(w, http.StatusInternalServerError, "%v", err) + service.Success(w, Settings{}) // 配置文件可能为空或格式错误,返回默认设置 return } - // 转换为 Settings 结构 settings := Settings{ RegistryMirrors: daemonConfig.RegistryMirrors, InsecureRegistries: daemonConfig.InsecureRegistries, @@ -127,7 +123,7 @@ func (s *App) UpdateSettings(w http.ResponseWriter, r *http.Request) { configPath := "/etc/docker/daemon.json" settings := req.Settings - // 读取现有配置(保留其他字段) + // 读取现有配置 var existingConfig map[string]any content, err := io.Read(configPath) if err == nil && content != "" {