mirror of
https://github.com/1Panel-dev/1Panel.git
synced 2026-10-09 16:00:29 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a888d289f |
@@ -788,6 +788,15 @@ func upgradeInstall(req request.AppInstallUpgrade) error {
|
|||||||
err = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
|
err = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
exist, err := dockerCLi.ImageExists(image)
|
||||||
|
if err != nil {
|
||||||
|
err = buserr.WithNameAndErr("ErrDockerPullImage", "", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
if !exist {
|
||||||
|
err = buserr.WithNameAndErr("ErrDockerPullImage", "", fmt.Errorf("image %s not found", image))
|
||||||
|
return err
|
||||||
|
}
|
||||||
t.LogSuccess(i18n.GetMsgByKey("PullImage"))
|
t.LogSuccess(i18n.GetMsgByKey("PullImage"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -208,6 +208,12 @@ func (c Client) PullImageWithProcessAndOptions(task *task.Task, imageName string
|
|||||||
}
|
}
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
if msg, ok := progress["errorDetail"]; ok {
|
||||||
|
return fmt.Errorf("image pull failed, err: %v", msg)
|
||||||
|
}
|
||||||
|
if msg, ok := progress["error"]; ok {
|
||||||
|
return fmt.Errorf("image pull failed, err: %v", msg)
|
||||||
|
}
|
||||||
status, _ := progress["status"].(string)
|
status, _ := progress["status"].(string)
|
||||||
if status == "Downloading" || status == "Extracting" {
|
if status == "Downloading" || status == "Extracting" {
|
||||||
logProcess(progress, task)
|
logProcess(progress, task)
|
||||||
|
|||||||
Reference in New Issue
Block a user