1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-11-10 11:40:53 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 解决删除本地运行环境报错的问题 (#599)

Browse source
This commit is contained in:
zhengkunwang223 2023-04-12 17:22:30 +08:00 • committed by GitHub
parent 6ff9c4335f
commit 01185306f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
backend/app/service/runtime.go
View file

@ -11,6 +11,7 @@ import (
"github.com/1Panel-dev/1Panel/backend/app/repo" "github.com/1Panel-dev/1Panel/backend/app/repo"
"github.com/1Panel-dev/1Panel/backend/buserr" "github.com/1Panel-dev/1Panel/backend/buserr"
"github.com/1Panel-dev/1Panel/backend/constant" "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/docker"
"github.com/1Panel-dev/1Panel/backend/utils/files" "github.com/1Panel-dev/1Panel/backend/utils/files"
"github.com/subosito/gotenv" "github.com/subosito/gotenv"
@ -146,18 +147,20 @@ func (r *RuntimeService) Delete(id uint) error {
if website.ID > 0 { if website.ID > 0 {
return buserr.New(constant.ErrDelWithWebsite) 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 { 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) runtimeDir := path.Join(constant.RuntimeDir, runtime.Type, runtime.Name)
if err := files.NewFileOp().DeleteDir(runtimeDir); err != nil { if err := files.NewFileOp().DeleteDir(runtimeDir); err != nil {
return err return err