Merge pull request #470 from kubero-dev/feature/make-command-field-accessible

Feature / Add field for command when deploying container images

Author: mms-gianni

client/src/components/apps/form.vue

@@ -177,7 +177,7 @@
                 value="git"
               ></v-radio>
               <v-radio
-                label="Docker Image"
+                label="Container Image"
                 value="docker"
               ></v-radio>
               <!--
@@ -381,9 +381,9 @@
         </div> <!-- end of buildstrategy != external -->
         </div> <!-- end of deploymentstrategy == git -->
 
-          <!-- DEPLOYMENT STRATEGY CONTAINER -->
-          <v-row
-            v-if="deploymentstrategy == 'docker' || (deploymentstrategy == 'git' && buildstrategy == 'external' )">
+        <!-- DEPLOYMENT STRATEGY CONTAINER -->
+        <div v-if="deploymentstrategy == 'docker'">
+          <v-row>
             <v-col
               cols="12"
               md="6"
@@ -396,8 +396,7 @@
               ></v-text-field>
             </v-col>
           </v-row>
-          <v-row
-            v-if="deploymentstrategy == 'docker' || (deploymentstrategy == 'git' && buildstrategy == 'external' )">
+          <v-row>
             <v-col
               cols="12"
               md="6"
@@ -410,6 +409,22 @@
               ></v-text-field>
             </v-col>
           </v-row>
+          <v-row
+            v-if="advanced">
+            <v-col
+              cols="12"
+              md="6"
+            >
+              <v-text-field
+                v-model="docker.command"
+                :counter="60"
+                label="Command"
+                required
+                bg-color="secondary"
+              ></v-text-field>
+            </v-col>
+          </v-row>
+        </div> <!-- end of deploymentstrategy == docker -->
         </v-expansion-panel-text>
       </v-expansion-panel>
 
@@ -1442,6 +1457,7 @@ export default defineComponent({
       docker: {
         image: 'ghcr.io/kubero-dev/idler',
         tag: 'latest',
+        command: '',
       },
       autodeploy: true,
       sslIndex: [] as (boolean|undefined)[],
@@ -1893,6 +1909,11 @@ export default defineComponent({
               this.panel.push(8)
             }
 
+            let command = '';
+            if (response.data.spec.image.command) {
+              command = response.data.spec.image.command.join(' ');
+            }
+
             this.security = response.data.spec.image.run.securityContext || {};
 
             this.deploymentstrategy = response.data.spec.deploymentstrategy;
@@ -1909,6 +1930,7 @@ export default defineComponent({
             this.imageTag = response.data.spec.imageTag;
             this.docker.image = response.data.spec.image.repository || '';
             this.docker.tag = response.data.spec.image.tag || 'latest';
+            this.docker.command = command;
             this.autodeploy = response.data.spec.autodeploy;
             this.envvars = response.data.spec.envVars;
             this.serviceAccount = response.data.spec.serviceAccount;
@@ -2008,6 +2030,13 @@ export default defineComponent({
         this.cleanupIngressAnnotations();
         this.setSSL();
 
+        let command = [] as string[];
+        if (this.docker.command.length > 0) {
+          command = this.docker.command.split(' ');
+        } else {
+          command = [];
+        }
+
         let postdata = {
           resourceVersion: this.resourceVersion,
           buildpack: this.buildpack,
@@ -2021,6 +2050,7 @@ export default defineComponent({
             containerport: this.containerPort,
             repository: this.docker.image,
             tag: this.docker.tag,
+            command: command,
             fetch: this.buildpack?.fetch,
             build: this.buildpack?.build,
             run: this.buildpack?.run,

server/src/modules/application.ts

@@ -71,6 +71,7 @@ export class App implements IApp{
         pullPolicy: 'Always',
         repository: string,
         tag: string,
+        command: [string],
         fetch: {
             repository: string,
             tag: string,
@@ -175,6 +176,7 @@ export class App implements IApp{
             pullPolicy: 'Always',
             repository: app.image.repository || 'ghcr.io/kubero-dev/idler',
             tag: app.image.tag || 'v1',
+            command: app.image.command,
             fetch: app.image.fetch,
             build: app.image.build,
             run: app.image.run,

server/src/routes/apps.ts

@@ -101,6 +101,10 @@ Router.post('/cli/apps', bearerMiddleware, async function (req: Request, res: Re
                                         type: "string",
                                         example: "latest"
                                     },
+                                    command: {
+                                        type: "string",
+                                        example: "npm start"
+                                    },
                                     fetch: {
                                         type: "object",
                                     },
@@ -216,6 +220,7 @@ function createApp(req: Request) : IApp {
             containerPort: req.body.image.containerport,
             repository: req.body.image.repository,
             tag: req.body.image.tag || "main",
+            command: req.body.image.command,
             pullPolicy: "Always",
             fetch: req.body.image.fetch,
             build: req.body.image.build,
@@ -276,6 +281,7 @@ Router.put('/pipelines/:pipeline/:phase/:app', authMiddleware, async function (r
             containerPort: req.body.image.containerport,
             repository: req.body.image.repository,
             tag: req.body.image.tag || "latest",
+            command: req.body.image.command,
             pullPolicy: "Always",
             fetch: req.body.image.fetch,
             build: req.body.image.build,

server/src/types.ts

@@ -16,6 +16,7 @@ export interface IApp {
     image : {
         repository: string,
         tag: string,
+        command: [string],
         pullPolicy: 'Always',
         containerPort: number,
         fetch: {