From 01185306f28e922fdace1c4bdb397de99afe2c35 Mon Sep 17 00:00:00 2001 From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com> Date: Wed, 12 Apr 2023 17:22:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=BF=90=E8=A1=8C=E7=8E=AF=E5=A2=83=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=20(#599)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/runtime.go | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/backend/app/service/runtime.go b/backend/app/service/runtime.go index a580556bc..8e3e427bc 100644 --- a/backend/app/service/runtime.go +++ b/backend/app/service/runtime.go @@ -11,6 +11,7 @@ import ( "github.com/1Panel-dev/1Panel/backend/app/repo" "github.com/1Panel-dev/1Panel/backend/buserr" "github.com/1Panel-dev/1Panel/backend/constant" + "github.com/1Panel-dev/1Panel/backend/global" "github.com/1Panel-dev/1Panel/backend/utils/docker" "github.com/1Panel-dev/1Panel/backend/utils/files" "github.com/subosito/gotenv" @@ -146,18 +147,20 @@ func (r *RuntimeService) Delete(id uint) error { if website.ID > 0 { return buserr.New(constant.ErrDelWithWebsite) } - client, err := docker.NewClient() - if err != nil { - return err - } - imageID, err := client.GetImageIDByName(runtime.Image) - if err != nil { - return err - } - if err := client.DeleteImage(imageID); err != nil { - return err - } if runtime.Resource == constant.ResourceAppstore { + client, err := docker.NewClient() + if err != nil { + return err + } + imageID, err := client.GetImageIDByName(runtime.Image) + if err != nil { + return err + } + if imageID != "" { + if err := client.DeleteImage(imageID); err != nil { + global.LOG.Errorf("delete image id [%s] error %v", imageID, err) + } + } runtimeDir := path.Join(constant.RuntimeDir, runtime.Type, runtime.Name) if err := files.NewFileOp().DeleteDir(runtimeDir); err != nil { return err