Add capAppName to appDef.tags

caprover · Nov 20, 2023 · 082f8a6 · 082f8a6
1 parent 767ed04
commit 082f8a6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/containers/apps/oneclick/OneClickAppDeployManager.ts b/src/containers/apps/oneclick/OneClickAppDeployManager.ts
@@ -5,6 +5,7 @@ import {
 } from '../../../models/IOneClickAppModels'
 import Utils from '../../../utils/Utils'
 import OneClickAppDeploymentHelper from './OneClickAppDeploymentHelper'
+import { ONE_CLICK_APP_NAME_VAR_NAME } from './variables/OneClickAppConfigPage'
 
 interface IDeploymentStep {
     stepName: string
@@ -90,12 +91,14 @@ export default class OneClickAppDeployManager {
             })
         } else {
             const steps: IDeploymentStep[] = []
+            const capAppName = values[ONE_CLICK_APP_NAME_VAR_NAME]
             for (let index = 0; index < apps.length; index++) {
                 const appToDeploy = apps[index]
                 steps.push(
                     ...self.createDeploymentStepPromises(
                         appToDeploy.appName,
-                        appToDeploy.service
+                        appToDeploy.service,
+                        capAppName
                     )
                 )
             }
@@ -207,7 +210,8 @@ export default class OneClickAppDeployManager {
 
     private createDeploymentStepPromises(
         appName: string,
-        dockerComposeService: IDockerComposeService
+        dockerComposeService: IDockerComposeService,
+        capAppName: string
     ): IDeploymentStep[] {
         const promises: IDeploymentStep[] = []
         const self = this
@@ -227,7 +231,8 @@ export default class OneClickAppDeployManager {
             stepPromise: function () {
                 return self.deploymentHelper.createConfigurationPromise(
                     appName,
-                    dockerComposeService
+                    dockerComposeService,
+                    capAppName
                 )
             },
         })

diff --git a/src/containers/apps/oneclick/OneClickAppDeploymentHelper.ts b/src/containers/apps/oneclick/OneClickAppDeploymentHelper.ts
@@ -25,7 +25,8 @@ export default class OneClickAppDeploymentHelper {
 
     createConfigurationPromise(
         appName: string,
-        dockerComposeService: IDockerComposeService
+        dockerComposeService: IDockerComposeService,
+        capAppName: string
     ) {
         const self = this
         return Promise.resolve().then(function () {
@@ -48,6 +49,11 @@ export default class OneClickAppDeploymentHelper {
                     }
 
                     appDef.volumes = appDef.volumes || []
+                    appDef.tags = [
+                        {
+                            tagName: capAppName,
+                        },
+                    ]
 
                     const vols = dockerComposeService.volumes || []
                     for (let i = 0; i < vols.length; i++) {