Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 40314e9

Browse files
authored
Fix Issue with Podman Unable to Change PHP Runtime in Website Page (1Panel-dev#9711)
* Update container.go * Update website.go
1 parent 82f978c commit 40314e9

File tree

2 files changed

+26
-19
lines changed

2 files changed

+26
-19
lines changed

‎agent/app/service/container.go

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1240,23 +1240,30 @@ func checkImageExist(client *client.Client, imageItem string) bool {
12401240
return false
12411241
}
12421242

1243-
func checkImageLike(imageName string) bool {
1244-
cli, err := docker.NewDockerClient()
1245-
if err != nil {
1246-
return false
1247-
}
1248-
images, err := cli.ImageList(context.Background(), image.ListOptions{})
1249-
if err != nil {
1250-
return false
1251-
}
1252-
for _, img := range images {
1253-
for _, tag := range img.RepoTags {
1254-
if strings.Contains(tag, imageName) {
1255-
return true
1256-
}
1257-
}
1258-
}
1259-
return false
1243+
func checkImageLike(client *client.Client, imageName string) bool {
1244+
if client == nil {
1245+
var err error
1246+
client, err = docker.NewDockerClient()
1247+
if err != nil {
1248+
return false
1249+
}
1250+
}
1251+
images, err := client.ImageList(context.Background(), image.ListOptions{})
1252+
if err != nil {
1253+
return false
1254+
}
1255+
1256+
for _, img := range images {
1257+
for _, tag := range img.RepoTags {
1258+
parts := strings.Split(tag, "/")
1259+
imageNameWithTag := parts[len(parts)-1]
1260+
1261+
if imageNameWithTag == imageName {
1262+
return true
1263+
}
1264+
}
1265+
}
1266+
return false
12601267
}
12611268

12621269
func pullImages(task *task.Task, client *client.Client, imageName string) error {

‎agent/app/service/website.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ func (w WebsiteService) CreateWebsite(create request.WebsiteCreate) (err error)
388388
switch runtime.Type {
389389
case constant.RuntimePHP:
390390
if runtime.Resource == constant.ResourceAppstore {
391-
if !checkImageLike(runtime.Image) {
391+
if !checkImageLike(nil, runtime.Image) {
392392
return buserr.WithName("ErrImageNotExist", runtime.Name)
393393
}
394394
website.Proxy = fmt.Sprintf("127.0.0.1:%s", runtime.Port)
@@ -1354,7 +1354,7 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
13541354
return err
13551355
}
13561356
defer client.Close()
1357-
if !checkImageExist(client, oldRuntime.Image) {
1357+
if !checkImageLike(client, oldRuntime.Image) {
13581358
return buserr.WithName("ErrImageNotExist", oldRuntime.Name)
13591359
}
13601360
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /