v1.9.0

Author: donknap

app/application/http/controller/compose-container.go

@@ -156,7 +156,7 @@ func (self Compose) ContainerDeploy(http *gin.Context) {
 
 	// 这里需要单独适配一下 php 环境的相关扩展安装
 	// 目前只有 php 需要这样处理，暂时先直接进行判断
-	if strings.Contains(composeRow.Setting.Store, accessor.StoreTypeOnePanel) && strings.HasSuffix(composeRow.Setting.Store, "@php") {
+	if strings.HasPrefix(composeRow.Setting.Store, accessor.StoreTypeOnePanel) && strings.HasSuffix(composeRow.Setting.Store, "@php") {
 		_ = docker.Sdk.NetworkConnect(docker.Sdk.Ctx, docker.NetworkItem{
 			Name: define.DPanelProxyNetworkName,
 		}, runCompose.ContainerList[0].Container.Names[0])

app/application/http/controller/image-tag.go

@@ -7,7 +7,9 @@ import (
 	http2 "net/http"
 	"strings"
 
+	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/image"
+	"github.com/docker/docker/api/types/registry"
 	"github.com/donknap/dpanel/app/application/logic"
 	"github.com/donknap/dpanel/common/dao"
 	"github.com/donknap/dpanel/common/function"
@@ -202,20 +204,20 @@ func (self Image) TagPushBatch(http *gin.Context) {
 	}
 
 	for _, id := range params.RegistryId {
-		registry, _ := dao.Registry.Where(dao.Registry.ID.Eq(id)).First()
-		if registry == nil {
+		registryRow, err := dao.Registry.Where(dao.Registry.ID.Eq(id)).First()
+		if err != nil || registryRow == nil {
 			self.JsonResponseWithError(http, function.ErrorMessage(define.ErrorMessageCommonDataNotFoundOrDeleted), 500)
 			return
 		}
 		password := ""
-		if registry.Setting != nil && registry.Setting.Username != "" && registry.Setting.Password != "" {
-			password, _ = function.AseDecode(facade.GetConfig().GetString("app.name"), registry.Setting.Password)
+		if registryRow.Setting != nil && registryRow.Setting.Username != "" && registryRow.Setting.Password != "" {
+			password, _ = function.AseDecode(facade.GetConfig().GetString("app.name"), registryRow.Setting.Password)
 		}
 
 		registryConfig := registry2.Config{
-			Username: registry.Setting.Username,
+			Username: registryRow.Setting.Username,
 			Password: password,
-			Host:     registry.ServerAddress,
+			Host:     registryRow.ServerAddress,
 		}
 
 		for _, md5 := range params.Md5 {
@@ -226,7 +228,7 @@ func (self Image) TagPushBatch(http *gin.Context) {
 			}
 			for _, tag := range imageDetail.RepoTags {
 				newImageName := registry2.GetImageTagDetail(tag)
-				newImageName.Registry = registry.ServerAddress
+				newImageName.Registry = registryRow.ServerAddress
 				newImageName.Namespace = params.NewNamespace
 
 				if !function.InArray(imageDetail.RepoTags, newImageName.Uri()) {
@@ -256,3 +258,27 @@ func (self Image) TagPushBatch(http *gin.Context) {
 	self.JsonSuccessResponse(http)
 	return
 }
+
+func (self Image) TagSearch(http *gin.Context) {
+	type ParamsValidate struct {
+		Keywork string `json:"keywork" binding:"required"`
+	}
+	params := ParamsValidate{}
+	if !self.Validate(http, &params) {
+		return
+	}
+	list, err := docker.Sdk.Client.ImageSearch(docker.Sdk.Ctx, params.Keywork, registry.SearchOptions{
+		RegistryAuth:  "",
+		PrivilegeFunc: nil,
+		Filters:       filters.Args{},
+		Limit:         0,
+	})
+	if err != nil {
+		self.JsonResponseWithError(http, err, 500)
+		return
+	}
+	self.JsonResponseWithoutError(http, gin.H{
+		"list": list,
+	})
+	return
+}

app/application/logic/docker-image-task.go

@@ -30,7 +30,7 @@ func (self DockerTask) ImageBuild(messageId string, task accessor.ImageSettingOp
 		builder.WithDockerFileContent([]byte(task.BuildDockerfileContent)),
 		builder.WithGitUrl(task.BuildGit),
 		builder.WithZipFilePath(task.BuildZip),
-		builder.WithPlatform(task.Platform),
+		builder.WithPlatform(task.PlatformArch),
 		builder.WithTag(task.Tag),
 		builder.WithArgs(task.BuildArgs...),
 	)

app/application/provider.go

@@ -76,6 +76,7 @@ func (provider *Provider) Register(httpServer *httpserver.Server) {
 			cors.POST("/app/image/tag-delete", controller.Image{}.TagDelete)
 			cors.POST("/app/image/tag-add", controller.Image{}.TagAdd)
 			cors.POST("/app/image/tag-push-batch", controller.Image{}.TagPushBatch)
+			cors.POST("/app/image/tag-search", controller.Image{}.TagSearch)
 
 			cors.POST("/app/image-build/create", controller.ImageBuild{}.Create)
 			cors.POST("/app/image-build/get-list", controller.ImageBuild{}.GetList)

app/common/http/controller/store.go

@@ -307,7 +307,7 @@ func (self Store) Deploy(http *gin.Context) {
 		Title: params.Title,
 		Setting: &accessor.ComposeSettingOption{
 			Type:        accessor.ComposeTypeStore,
-			Store:       fmt.Sprintf("%s:%s@%s@%s", storeRow.Title, storeRow.Setting.Type, storeRow.Setting.Url, params.AppName),
+			Store:       fmt.Sprintf("%s:%s@%s@%s", storeRow.Setting.Type, storeRow.Title, storeRow.Setting.Url, params.AppName),
 			Environment: params.Environment,
 			Uri: []string{
 				filepath.Join(params.Name, filepath.Base(params.ComposeFile)),

asset/static/index.html

@@ -18,6 +18,6 @@
 </head>
 <body>
 <div id="root"></div>
-<script src="/dpanel/static/asset/umi.5009c923.js"></script>
+<script src="/dpanel/static/asset/umi.bb6d456c.js"></script>
 </body>
 </html>

…tatic/p__image__create.67846e0a.async.js …tatic/p__image__create.57164e06.async.jsasset/static/p__image__create.67846e0a.async.js renamed to asset/static/p__image__create.57164e06.async.js asset/static/p__image__create.67846e0a.async.js renamed to asset/static/p__image__create.57164e06.async.js

@@ -13,7 +13,8 @@ type ImageSettingOption struct {
 	BuildGit               string                `json:"buildGit"`
 	BuildZip               string                `json:"buildZip"`
 	BuildArgs              []docker.EnvItem      `json:"buildArgs,omitempty"`
-	Platform               *docker.ImagePlatform `json:"platform,omitempty"`
+	Platform               string                `json:"platform,omitempty"` // Deprecated: instead PlatformArch
+	PlatformArch           *docker.ImagePlatform `json:"platformArch,omitempty"`
 	BuildDockerfile        string                `json:"buildDockerfile,omitempty,deprecated"` // Deprecated: instead BuildDockerfileContent
 	BuildRoot              string                `json:"buildRoot,omitempty,deprecated"`       // Deprecated: instead BuildDockerfileRoot
 }

asset/static/umi.5009c923.js asset/static/umi.bb6d456c.jsasset/static/umi.5009c923.js renamed to asset/static/umi.bb6d456c.js

@@ -80,7 +80,7 @@ func WithTag(name ...string) Option {
 
 func WithPlatform(item *docker.ImagePlatform) Option {
 	return func(self *Builder) error {
-		if item.Arch == "" || item.Type == "" {
+		if item == nil || item.Arch == "" || item.Type == "" {
 			return nil
 		}
 		self.imageBuildOption.Platform = item.Type