donknap · Nov 29, 2024
diff --git a/‎app/application/logic/compose.go
+1-1 b/‎app/application/logic/compose.go
+1-1
diff --git a/‎app/common/http/controller/store.go
+8-6 b/‎app/common/http/controller/store.go
+8-6
diff --git a/‎app/common/logic/store.go
+6 b/‎app/common/logic/store.go
+6
diff --git a/‎asset/static/index.html
+1-1 b/‎asset/static/index.html
+1-1
diff --git a/‎asset/static/p__app__create__image.5316b09c.async.js
+5 b/‎asset/static/p__app__create__image.5316b09c.async.js
+5
diff --git a/‎asset/static/p__app__create__image.9f1ffb74.async.js
-5 b/‎asset/static/p__app__create__image.9f1ffb74.async.js
-5
diff --git a/‎asset/static/p__app__list.77e55adb.async.js ‎asset/static/p__app__list.6f7f960b.async.js
+1-1 b/‎asset/static/p__app__list.77e55adb.async.js ‎asset/static/p__app__list.6f7f960b.async.js
+1-1
diff --git a/‎asset/static/p__compose__appstore.0a63b7c2.async.js
+9 b/‎asset/static/p__compose__appstore.0a63b7c2.async.js
+9
diff --git a/‎asset/static/p__compose__appstore.b60fcf6c.async.js
-5 b/‎asset/static/p__compose__appstore.b60fcf6c.async.js
-5
diff --git a/‎asset/static/p__compose__create.a0e4184a.async.js
+3 b/‎asset/static/p__compose__create.a0e4184a.async.js
+3
diff --git a/‎asset/static/p__compose__create.bcac50fb.async.js
-3 b/‎asset/static/p__compose__create.bcac50fb.async.js
-3
diff --git a/‎asset/static/p__compose__deploy.2a714692.async.js
-3 b/‎asset/static/p__compose__deploy.2a714692.async.js
-3
diff --git a/‎asset/static/p__compose__deploy.e9fd5ff1.async.js
+3 b/‎asset/static/p__compose__deploy.e9fd5ff1.async.js
+3
diff --git a/‎asset/static/p__system__appstore.2279d1b6.async.js
+1 b/‎asset/static/p__system__appstore.2279d1b6.async.js
+1
diff --git a/‎asset/static/p__system__appstore.31e100f5.async.js
-1 b/‎asset/static/p__system__appstore.31e100f5.async.js
-1
diff --git a/‎asset/static/umi.9edcb667.js ‎asset/static/umi.9c4e42ea.js
+1-1 b/‎asset/static/umi.9edcb667.js ‎asset/static/umi.9c4e42ea.js
+1-1
diff --git a/‎common/service/compose/placehold.go
+17 b/‎common/service/compose/placehold.go
+17
@@ -317,7 +317,7 @@ func (self Compose) GetTasker(entity *entity.Compose) (*compose.Task, error) {
 	if !function.IsEmptyArray(entity.Setting.Environment) {
 		globalEnv := make([]string, 0)
 		for _, item := range entity.Setting.Environment {
-			globalEnv = append(globalEnv, fmt.Sprintf("%s=%s", item.Name, item.Value))
+			globalEnv = append(globalEnv, fmt.Sprintf("%s=%s", item.Name, compose.ReplacePlaceholder(item.Value)))
 		}
 		envFileName := filepath.Join(taskFileDir, ComposeProjectEnvFileName)
 		err := os.MkdirAll(filepath.Dir(envFileName), os.ModePerm)
 
@@ -205,9 +205,10 @@ func (self Store) Sync(http *gin.Context) {
 
 func (self Store) Deploy(http *gin.Context) {
 	type ParamsValidate struct {
-		StoreId     int32  `json:"storeId" binding:"required"`
-		Name        string `json:"name" binding:"required"`
-		ComposeFile string `json:"composeFile" binding:"required"`
+		StoreId     int32              `json:"storeId" binding:"required"`
+		Name        string             `json:"name" binding:"required"`
+		ComposeFile string             `json:"composeFile" binding:"required"`
+		Environment []accessor.EnvItem `json:"environment"`
 	}
 	params := ParamsValidate{}
 	if !self.Validate(http, &params) {
@@ -229,9 +230,10 @@ func (self Store) Deploy(http *gin.Context) {
 		Title: "",
 		Yaml:  "",
 		Setting: &accessor.ComposeSettingOption{
-			Status: "waiting",
-			Type:   accessor.ComposeTypeStore,
-			Store:  fmt.Sprintf("%s@%s", storeRow.Title, storeRow.Setting.Url),
+			Status:      "waiting",
+			Type:        accessor.ComposeTypeStore,
+			Store:       fmt.Sprintf("%s@%s", storeRow.Title, storeRow.Setting.Url),
+			Environment: params.Environment,
 			Uri: []string{
 				filepath.Join(params.Name, filepath.Base(params.ComposeFile)),
 			},
 
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"github.com/donknap/dpanel/common/accessor"
 	"github.com/donknap/dpanel/common/function"
+	"github.com/donknap/dpanel/common/service/compose"
 	"github.com/donknap/dpanel/common/service/exec"
 	"github.com/donknap/dpanel/common/service/storage"
 	"gopkg.in/yaml.v3"
@@ -202,6 +203,11 @@ func (self Store) GetAppByOnePanel(storePath string) ([]accessor.StoreAppItem, e
 			if len(segments) == 3 {
 				fields := yamlData.GetSliceStringMapString("additionalProperties.formFields")
 				env := make([]accessor.EnvItem, 0)
+				env = append(env, accessor.EnvItem{
+					Name:  "CONTAINER_NAME",
+					Label: "容器名称",
+					Value: compose.ContainerDefaultName,
+				})
 				for _, field := range fields {
 					env = append(env, accessor.EnvItem{
 						Name:  field["envKey"],
 
@@ -18,6 +18,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/dpanel/static/asset/umi.9edcb667.js"></script>
+<script src="/dpanel/static/asset/umi.9c4e42ea.js"></script>
 </body>
 </html>
@@ -0,0 +1,17 @@
+package compose
+
+const (
+	ContainerDefaultName = "%CONTAINER_DEFAULT_NAME%"
+)
+
+var placeholderList = map[string]string{
+	ContainerDefaultName: "",
+}
+
+func ReplacePlaceholder(str string) string {
+	if value, ok := placeholderList[str]; ok {
+		return value
+	} else {
+		return ""
+	}
+}
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ func (self Compose) GetTasker(entity entity.Compose) (compose.Task, error) {`
`317`	`317`	`if !function.IsEmptyArray(entity.Setting.Environment) {`
`318`	`318`	`globalEnv := make([]string, 0)`
`319`	`319`	`for _, item := range entity.Setting.Environment {`
`320`		`- globalEnv = append(globalEnv, fmt.Sprintf("%s=%s", item.Name, item.Value))`
	`320`	`+ globalEnv = append(globalEnv, fmt.Sprintf("%s=%s", item.Name, compose.ReplacePlaceholder(item.Value)))`
`321`	`321`	`}`
`322`	`322`	`envFileName := filepath.Join(taskFileDir, ComposeProjectEnvFileName)`
`323`	`323`	`err := os.MkdirAll(filepath.Dir(envFileName), os.ModePerm)`