Merge remote-tracking branch 'upstream/main' into feature/adaptCobiGenTemplates

Author: denise-khuu

documentation/Functions.md

@@ -232,12 +232,11 @@ image: Path to an image to be displayed in the katacoda step.
 
 ***
 
+
 ### adaptTemplatesCobiGen
 #### parameter
 * No parameters
 #### example
 adaptTemplatesCobiGen()
 
 ***
-
-

runners/katacoda/index.ts

@@ -343,14 +343,28 @@ export class Katacoda extends Runner {
         return null;
     }
 
+
     runAdaptTemplatesCobiGen(step: Step, command: Command): RunResult {
         this.steps.push({
             "title": "Adapt cobiGen templates",
             "text": "step" + this.stepsCount + ".md"
         });
         this.renderTemplate("adaptTemplatesCobiGen.md", this.outputPathTutorial + "step" + (this.stepsCount++) + ".md", { text: step.text, textAfter: step.textAfter});
         return null;
-    
+    }
+
+    runDockerCompose(step: Step, command: Command) : RunResult {
+        let terminal = this.getTerminal('runDockerCompose');
+        let cdCommand = this.changeCurrentDir(path.join(this.getVariable(this.workspaceDirectory), command.parameters[0]), terminal.terminalId, terminal.isRunning);
+
+        this.steps.push({
+            "title": "Execute Docker Compose",
+            "text": "step" +this.stepsCount + ".md"
+        });
+
+        this.renderTemplate("dockerCompose.md", this.outputPathTutorial + "step" + (this.stepsCount++) + ".md", { text: step.text, textAfter: step.textAfter, cdCommand: cdCommand, terminalId: terminal.terminalId, interrupt: terminal.isRunning, port: command.parameters[1].port});
+        return null;
+
     }
 
     private renderTemplate(name: string, targetPath: string, variables) {

runners/katacoda/templates/dockerCompose.md

@@ -0,0 +1,20 @@
+<%= text; %>
+
+<%= cdCommand; %>
+
+<% if(!interrupt){ %>
+Now run docker-compose.
+<% } else { %>
+The docker container is already running.
+Usually you would type "Ctrl + C" and rerun the same command in this terminal to rebuild the app, but for now click on the command to stop and relaunch it automatically.
+<% } %> 
+
+`docker-compose up`{{execute T<%= terminalId; %> <% if (interrupt) { %>interrupt<% } %>}}
+
+This will take some time.
+
+<% if(port){ %>
+Then you can open the following link to use the app. 
+https://[[HOST_SUBDOMAIN]]-<%= port %>-[[KATACODA_HOST]].environments.katacoda.com/
+<% } %> 
+<%= textAfter; %>