v1.9.1.2 fix #243

Author: donknap

.github/workflows/release.yml

@@ -279,4 +279,39 @@ jobs:
         with:
           tag_name: ${{ github.ref_name }}
           files: runtime/*
-          prerelease: false
+          prerelease: false
+  push-tags-to-related-repos:
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout dpanel-gui
+        uses: actions/checkout@v4
+        with:
+          repository: donknap/dpanel-gui
+          token: ${{ secrets.MY_GITHUB_TOKEN }}
+          path: dpanel-gui
+
+      - name: Push tag to dpanel-gui
+        working-directory: ./dpanel-gui
+        run: |
+          TAG=${{ github.ref_name }}
+          git config user.name "donknap"
+          git config user.email "donknap@gmail.com"
+          git tag -f "$TAG"
+          git push origin "$TAG" --force
+
+      - name: Checkout dpanel-fnnas
+        uses: actions/checkout@v4
+        with:
+          repository: donknap/dpanel-fnnas
+          token: ${{ secrets.MY_GITHUB_TOKEN }}
+          path: dpanel-fnnas
+
+      - name: Push tag to dpanel-fnnas
+        working-directory: ./dpanel-fnnas
+        run: |
+          TAG=${{ github.ref_name }}
+          git config user.name "donknap"
+          git config user.email "donknap@gmail.com"
+          git tag -f "$TAG"
+          git push origin "$TAG" --force

app/application/logic/compose.go

@@ -287,6 +287,11 @@ func (self Compose) Sync(dockerEnvName string) error {
 	composeList, _ := dao.Compose.Find()
 	for _, dbComposeRow := range composeList {
 		if find, ok := findComposeList[dbComposeRow.Name]; ok && find.Setting.DockerEnvName == dbComposeRow.Setting.DockerEnvName {
+			// 如果 uri 中的文件名不在数据库中，则更新
+			if !function.InArrayArray(dbComposeRow.Setting.Uri, find.Setting.Uri...) {
+				dbComposeRow.Setting.Uri = find.Setting.Uri
+				_ = dao.Compose.Save(dbComposeRow)
+			}
 			delete(findComposeList, dbComposeRow.Name)
 		} else {
 			// 除非任务的类型是属于当前的环境才执行删除
@@ -321,9 +326,11 @@ func (self Compose) ComposeProjectOptionsFn(dbRow *entity.Compose) []cli.Project
 	}
 	// 如果开启了独立目录，获取挂载目录也应该只取对应的的
 	mountComposePath := "/dpanel/compose"
-	if dbRow.Setting.DockerEnvName != docker.DefaultClientName {
+
+	if docker.S().DockerEnv.EnableComposePath {
 		mountComposePath = filepath.Join("/", "dpanel", "compose-"+dbRow.Setting.DockerEnvName)
 	}
+
 	for _, mount := range dpanelContainerInfo.Mounts {
 		if mount.Type == types.VolumeTypeBind && mount.Destination == mountComposePath && !strings.HasSuffix(filepath.VolumeName(mount.Source), ":") {
 			linkComposePath = mount.Source

app/common/http/controller/env.go

@@ -338,7 +338,7 @@ func (self Env) GetDetail(http *gin.Context) {
 			}
 		}
 	}
-	if dockerEnv.EnableSSH && dockerEnv.ServerUrl == "" {
+	if dockerEnv.EnableSSH && dockerEnv.Name != docker.DefaultClientName && dockerEnv.ServerUrl == "" {
 		dockerEnv.ServerUrl = dockerEnv.SshServerInfo.Address
 	}
 	if dockerEnv.ServerUrl == "" {

app/common/http/controller/home.go

@@ -544,7 +544,7 @@ func (self Home) Usage(http *gin.Context) {
 		recycleQuery = recycleQuery.Where(dao.Site.SiteName.NotIn(names...))
 	}
 	containerTask, _ := recycleQuery.Count()
-	imageTask, _ := dao.Image.Count()
+	imageTask, _ := dao.Image.Where(dao.Image.Setting.IsNotNull()).Count()
 	backupData, _ := dao.Backup.Count()
 
 	self.JsonResponseWithoutError(http, gin.H{

app/common/http/controller/store.go

@@ -328,13 +328,13 @@ func (self Store) Deploy(http *gin.Context) {
 			Uri: []string{
 				filepath.Join(params.Name, filepath.Base(params.ComposeFile)),
 			},
-			DockerEnvName: docker.DefaultClientName,
+			DockerEnvName: docker.Sdk.Name,
 		},
 	}
+
 	targetPath := filepath.Join(storage.Local{}.GetComposePath(""), params.Name)
 	if docker.Sdk.DockerEnv.EnableComposePath {
 		targetPath = filepath.Join(storage.Local{}.GetComposePath(docker.Sdk.Name), params.Name)
-		composeNew.Setting.DockerEnvName = docker.Sdk.Name
 	}
 
 	err = dao.Compose.Create(composeNew)