gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-19 08:19:15 +08:00
Code

feat: 解决编辑镜像之后会删除镜像的问题 (#613)

Browse Source
This commit is contained in:
zhengkunwang223 2023-04-13 14:42:34 +08:00 committed by GitHub
parent cd79cac0af
commit 9603389586
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
backend/app/service/runtime_utils.go
View File

@ -13,24 +13,27 @@ import (
"strings" "strings"
) )
func buildRuntime(runtime *model.Runtime, service *docker.ComposeService, imageID string) { func buildRuntime(runtime *model.Runtime, service *docker.ComposeService, oldImageID string) {
err := service.ComposeBuild() err := service.ComposeBuild()
if err != nil { if err != nil {
runtime.Status = constant.RuntimeError runtime.Status = constant.RuntimeError
runtime.Message = buserr.New(constant.ErrImageBuildErr).Error() + ":" + err.Error() runtime.Message = buserr.New(constant.ErrImageBuildErr).Error() + ":" + err.Error()
} else { } else {
runtime.Status = constant.RuntimeNormal runtime.Status = constant.RuntimeNormal
if imageID != "" { if oldImageID != "" {
client, err := docker.NewClient() client, err := docker.NewClient()
global.LOG.Infof("delete imageID [%s] ", imageID)
if err == nil { if err == nil {
if err := client.DeleteImage(imageID); err != nil { newImageID, err := client.GetImageIDByName(runtime.Image)
global.LOG.Errorf("delete imageID [%s] error %v", imageID, err) if err == nil && newImageID != oldImageID {
} else { global.LOG.Infof("delete imageID [%s] ", oldImageID)
global.LOG.Infof("delete old image success") if err := client.DeleteImage(oldImageID); err != nil {
global.LOG.Errorf("delete imageID [%s] error %v", oldImageID, err)
} else {
global.LOG.Infof("delete old image success")
}
} }
} else { } else {
global.LOG.Errorf("delete imageID [%s] error %v", imageID, err) global.LOG.Errorf("delete imageID [%s] error %v", oldImageID, err)
} }
} }
} }