gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 22:18:07 +08:00
Code

fix: 解决已安装应用包含大写字母，启动失败的BUG (#559)

Browse Source
This commit is contained in:
zhengkunwang223 2023-04-10 14:44:23 +08:00 committed by GitHub
parent 4a4c2b24dd
commit 47d090d481
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/service/website.go
View File

@ -185,8 +185,8 @@ func (w WebsiteService) CreateWebsite(ctx context.Context, create request.Websit
} }
if runtime.Resource == constant.ResourceAppstore { if runtime.Resource == constant.ResourceAppstore {
var req request.AppInstallCreate var req request.AppInstallCreate
reg, _ := regexp.Compile("[^a-z0-9_\\-]+") reg, _ := regexp.Compile(`[^a-z0-9_-]+`)
req.Name = reg.ReplaceAllString(create.PrimaryDomain, "") req.Name = reg.ReplaceAllString(strings.ToLower(create.PrimaryDomain), "")
req.AppDetailId = create.AppInstall.AppDetailId req.AppDetailId = create.AppInstall.AppDetailId
req.Params = create.AppInstall.Params req.Params = create.AppInstall.Params
req.Params["IMAGE_NAME"] = runtime.Image req.Params["IMAGE_NAME"] = runtime.Image

4
backend/utils/docker/compose.go
View File

@ -11,6 +11,7 @@ import (
"github.com/docker/docker/client" "github.com/docker/docker/client"
"github.com/joho/godotenv" "github.com/joho/godotenv"
"path" "path"
"regexp"
"strings" "strings"
"time" "time"
) )
@ -103,6 +104,9 @@ func GetComposeProject(projectName, workDir string, yml []byte, env []byte, skip
ConfigFiles: configFiles, ConfigFiles: configFiles,
Environment: envMap, Environment: envMap,
} }
projectName = strings.ToLower(projectName)
reg, _ := regexp.Compile(`[^a-z0-9_-]+`)
projectName = reg.ReplaceAllString(projectName, "")
project, err := loader.Load(details, func(options *loader.Options) { project, err := loader.Load(details, func(options *loader.Options) {
options.SetProjectName(projectName, true) options.SetProjectName(projectName, true)
options.ResolvePaths = true options.ResolvePaths = true