1Panel-dev/1Panel
1
1
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-12-18 21:38:57 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Fix the issue where PHP extensions fail to install. (#10869)

Browse source
This commit is contained in:
CityFun 2025-11-05 15:34:02 +08:00 • committed by GitHub
parent 3a9275d5fa
commit 3be0dab8a3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
agent/app/service/runtime.go
View file

@ -31,7 +31,6 @@ import (
"github.com/1Panel-dev/1Panel/agent/constant" "github.com/1Panel-dev/1Panel/agent/constant"
"github.com/1Panel-dev/1Panel/agent/global" "github.com/1Panel-dev/1Panel/agent/global"
"github.com/1Panel-dev/1Panel/agent/utils/cmd" "github.com/1Panel-dev/1Panel/agent/utils/cmd"
cmd2 "github.com/1Panel-dev/1Panel/agent/utils/cmd"
"github.com/1Panel-dev/1Panel/agent/utils/compose" "github.com/1Panel-dev/1Panel/agent/utils/compose"
"github.com/1Panel-dev/1Panel/agent/utils/docker" "github.com/1Panel-dev/1Panel/agent/utils/docker"
"github.com/1Panel-dev/1Panel/agent/utils/env" "github.com/1Panel-dev/1Panel/agent/utils/env"
@ -718,9 +717,9 @@ func (r *RuntimeService) InstallPHPExtension(req request.PHPExtensionInstallReq)
if err != nil { if err != nil {
return err return err
} }
cmdMgr := cmd2.NewCommandMgr(cmd.WithTask(*installTask), cmd.WithTimeout(15*time.Minute))
installTask.AddSubTask("", func(t *task.Task) error { installTask.AddSubTask("", func(t *task.Task) error {
err = cmdMgr.RunBashCf("docker exec -i %s install-ext %s", runtime.ContainerName, req.Name) err = cmd.NewCommandMgr(cmd.WithTask(*installTask), cmd.WithTimeout(20*time.Minute)).
RunBashCf("docker exec -i %s install-ext %s", runtime.ContainerName, req.Name)
if err != nil { if err != nil {
return err return err
} }
@ -733,22 +732,23 @@ func (r *RuntimeService) InstallPHPExtension(req request.PHPExtensionInstallReq)
if err != nil { if err != nil {
return err return err
} }
err = cmdMgr.RunBashCf("docker commit %s %s", runtime.ContainerName, runtime.Image) err = cmd.NewCommandMgr(cmd.WithTask(*installTask), cmd.WithTimeout(15*time.Minute)).
RunBashCf("docker commit %s %s", runtime.ContainerName, runtime.Image)
if err != nil { if err != nil {
return err return err
} }
handlePHPDir(*runtime)
if err = restartRuntime(runtime); err != nil {
return err
}
newImageID, err := client.GetImageIDByName(runtime.Image) newImageID, err := client.GetImageIDByName(runtime.Image)
if err == nil && newImageID != oldImageID { if err == nil && newImageID != oldImageID {
if err := client.DeleteImage(oldImageID); err != nil { if err := client.DeleteImage(oldImageID); err != nil {
t.Log(fmt.Sprintf("delete old image error %v", err)) t.Log(fmt.Sprintf("delete old image %s failed %v", oldImageID, err))
} else { } else {
t.Log("delete old image success") t.Log("delete old image success")
} }
} }
handlePHPDir(*runtime)
if err = restartRuntime(runtime); err != nil {
return err
}
return nil return nil
}, nil) }, nil)
go func() { go func() {