|
|
|
@ -9,7 +9,6 @@ import (
|
|
|
|
|
"encoding/pem"
|
|
|
|
|
"errors"
|
|
|
|
|
"fmt"
|
|
|
|
|
"github.com/1Panel-dev/1Panel/backend/utils/common"
|
|
|
|
|
"os"
|
|
|
|
|
"path"
|
|
|
|
|
"reflect"
|
|
|
|
@ -1249,7 +1248,6 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
|
|
|
|
|
phpDir = path.Join(constant.RuntimeDir, runtime.Type, runtime.Name, "php")
|
|
|
|
|
oldFmContent, _ = fileOp.GetContent(fpmConfDir)
|
|
|
|
|
newComposeByte []byte
|
|
|
|
|
supervisorDir = path.Join(appInstall.GetPath(), "supervisor")
|
|
|
|
|
)
|
|
|
|
|
envParams := make(map[string]string, len(envs))
|
|
|
|
|
handleMap(envs, envParams)
|
|
|
|
@ -1291,21 +1289,6 @@ func (w WebsiteService) ChangePHPVersion(req request.WebsitePHPVersionReq) error
|
|
|
|
|
return busErr
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if common.CompareVersion(appDetail.Version, "7.0") && !fileOp.Stat(supervisorDir) {
|
|
|
|
|
if appDetail.Update {
|
|
|
|
|
app, err := appRepo.GetFirst(commonRepo.WithByID(appDetail.AppId))
|
|
|
|
|
if err != nil {
|
|
|
|
|
busErr = err
|
|
|
|
|
return busErr
|
|
|
|
|
}
|
|
|
|
|
if busErr = downloadApp(app, appDetail, nil); err != nil {
|
|
|
|
|
return busErr
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if busErr = fileOp.CopyDir(path.Join(phpDir, "supervisor"), appInstall.GetPath()); err != nil {
|
|
|
|
|
return busErr
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if out, err := compose.Up(appInstall.GetComposePath()); err != nil {
|
|
|
|
|
if out != "" {
|
|
|
|
|