Merge pull request caprover#1740 from caprover/app-tags

App tags

Author: githubsaturn

dockerfile-captain.edge

@@ -1,5 +1,4 @@
 FROM node:18
-RUN curl -Iv https://registry.yarnpkg.com
 RUN apt-get update && apt-get full-upgrade -yqq && apt-get install build-essential cmake -yqq
 
 RUN mkdir -p /usr/src/app

dockerfile-captain.release

@@ -1,5 +1,4 @@
 FROM node:18
-RUN curl -Iv https://registry.yarnpkg.com
 RUN apt-get update && apt-get full-upgrade -yqq && apt-get install build-essential cmake -yqq
 
 RUN mkdir -p /usr/src/app

src/datastore/AppsDataStore.ts

@@ -605,6 +605,7 @@ class AppsDataStore {
         captainDefinitionRelativeFilePath: string,
         envVars: IAppEnvVar[],
         volumes: IAppVolume[],
+        tags: IAppTag[],
         nodeId: string,
         notExposeAsWebApp: boolean,
         containerHttpPort: number,
@@ -691,6 +692,7 @@ class AppsDataStore {
                 appObj.preDeployFunction = preDeployFunction
                 appObj.serviceUpdateOverride = serviceUpdateOverride
                 appObj.description = description
+                appObj.tags = tags
 
                 appObj.appDeployTokenConfig = {
                     enabled: !!appDeployTokenConfig.enabled,
@@ -879,6 +881,7 @@ class AppsDataStore {
                 envVars: [],
                 volumes: [],
                 ports: [],
+                tags: [],
                 versions: [],
                 deployedVersion: 0,
                 notExposeAsWebApp: false,

src/models/AppDefinition.ts

@@ -48,6 +48,10 @@ interface IAppCustomDomain {
     hasSsl: boolean
 }
 
+interface IAppTag {
+    tagName: string
+}
+
 interface IAppDefinitionBase {
     description: string
     deployedVersion: number
@@ -65,6 +69,7 @@ interface IAppDefinitionBase {
     customNginxConfig?: string
     networks: string[]
     customDomain: IAppCustomDomain[]
+    tags?: IAppTag[]
     ports: IAppPort[]
     volumes: IAppVolume[]
     envVars: IAppEnvVar[]

src/routes/user/apps/appdefinition/AppDefinitionRouter.ts

@@ -316,6 +316,7 @@ router.post('/update/', function (req, res, next) {
     const captainDefinitionRelativeFilePath =
         req.body.captainDefinitionRelativeFilePath
     const notExposeAsWebApp = req.body.notExposeAsWebApp
+    const tags = req.body.tags || []
     const customNginxConfig = req.body.customNginxConfig
     const forceSsl = !!req.body.forceSsl
     const websocketSupport = !!req.body.websocketSupport
@@ -389,6 +390,7 @@ router.post('/update/', function (req, res, next) {
             captainDefinitionRelativeFilePath,
             envVars,
             volumes,
+            tags,
             nodeId,
             notExposeAsWebApp,
             containerHttpPort,

src/user/ServiceManager.ts

@@ -643,6 +643,7 @@ class ServiceManager {
         captainDefinitionRelativeFilePath: string,
         envVars: IAppEnvVar[],
         volumes: IAppVolume[],
+        tags: IAppTag[],
         nodeId: string,
         notExposeAsWebApp: boolean,
         containerHttpPort: number,
@@ -762,6 +763,7 @@ class ServiceManager {
                         captainDefinitionRelativeFilePath,
                         envVars,
                         volumes,
+                        tags,
                         nodeId,
                         notExposeAsWebApp,
                         containerHttpPort,

src/utils/MigrateCaptainDuckDuck.ts

@@ -327,6 +327,7 @@ export default class MigrateCaptainDuckDuck {
                                         CaptainConstants.defaultCaptainDefinitionPath,
                                         app.envVars || [],
                                         app.volumes || [],
+                                        [],
                                         app.nodeId || '',
                                         !!app.notExposeAsWebApp,
                                         80,