mtfyun/1panel
1
0 Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2026-11-10 21:21:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: Fixed issue with upgrade openresty failed (#13470)

Browse Source 
* fix: Fixed issue with upgrade openresty failed

* fix: Fixed issue with upgrade openresty failed
This commit is contained in:
CityFun authored and GitHub committed 2026-08-05 09:37:02 +08:00
1 parent 91ae846418
commit 17285d4397
1 file changed
+36 -8
Download Patch File Download Diff File Expand all files Collapse all files
agent/app/service/app_upgrade.go
+36 -8
View File
@@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"fmt"
"maps"
"os"
"path"
"sort"
@@ -26,7 +27,7 @@ import (
"github.com/1Panel-dev/1Panel/agent/utils/files"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/subosito/gotenv"
"github.com/joho/godotenv"
)
type appUpgradePhase int
@@ -255,7 +256,7 @@ func (u *appUpgradeContext) prepare(t *task.Task) error {
return buserr.WithName("ErrFileNotFound", "docker-compose.yml")
}
u.envContent, err = renderUpgradeEnv(u.candidate, u.oldEnvContent)
u.envContent, err = renderUpgradeEnv(&u.candidate, u.oldEnvContent)
if err != nil {
return err
}
@@ -699,20 +700,47 @@ func verifyUpgradeImages(images []string) error {
return nil
}
func renderUpgradeEnv(install model.AppInstall, original []byte) ([]byte, error) {
func renderUpgradeEnv(install *model.AppInstall, original []byte) ([]byte, error) {
originalEnv := make(map[string]string)
if len(original) > 0 {
var err error
originalEnv, err = godotenv.UnmarshalBytes(original)
if err != nil {
return nil, err
}
}
params := make(map[string]string, len(originalEnv))
maps.Copy(params, originalEnv)
envs := make(map[string]interface{})
if err := json.Unmarshal([]byte(install.Env), &envs); err != nil {
return nil, err
}
params := make(map[string]string, len(envs))
handleMap(envs, params)
if install.App.Key == constant.AppOpenresty {
originalEnv, _ := gotenv.Unmarshal(string(original))
for _, key := range []string{"CONTAINER_PACKAGE_URL", "RESTY_ADD_PACKAGE_BUILDDEPS", "RESTY_CONFIG_OPTIONS_MORE"} {
params[key] = originalEnv[key]
if value, ok := originalEnv[key]; ok {
params[key] = value
}
}
if websiteDir := strings.TrimSpace(originalEnv["WEBSITE_DIR"]); websiteDir != "" {
params["WEBSITE_DIR"] = websiteDir
}
websiteDir := strings.TrimSpace(params["WEBSITE_DIR"])
if websiteDir == "" {
websiteDir = NewISettingService().GetWebsiteDir()
}
if !path.IsAbs(websiteDir) {
websiteDir = path.Join(global.Dir.DataDir, websiteDir)
}
params["WEBSITE_DIR"] = websiteDir
envs["WEBSITE_DIR"] = websiteDir
content, marshalErr := json.Marshal(envs)
if marshalErr != nil {
return nil, marshalErr
}
install.Env = string(content)
}
content, err := gotenv.Marshal(params)
content, err := godotenv.Marshal(params)
if err != nil {
return nil, err
}
@@ -847,7 +875,7 @@ func waitAppContainersReady(ctx context.Context, install model.AppInstall) ([]st
func waitAppContainersReadyWithClient(ctx context.Context, client appContainerReadinessClient, install model.AppInstall) ([]string, error) {
envContent, err := os.ReadFile(install.GetEnvPath())
if err != nil {
envContent, err = renderUpgradeEnv(install, nil)
envContent, err = renderUpgradeEnv(&install, nil)
if err != nil {
return nil, err
}