updated and integrated external terminal

Author: MarcelDiessner

runners/katacoda/index.ts

@@ -339,14 +339,15 @@ export class Katacoda extends Runner {
     }
 
     runDockerCompose(step: Step, command: Command) : RunResult {
-        let cdCommand = this.changeCurrentDir(path.join("/root", "devonfw", "workspaces", "main"));
+        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, filePath: command.parameters[0].replace(/\\/g, "/") });
+        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, useDevonCommand: this.getVariable(this.useDevonCommand)});
         return null;
     }
 

runners/katacoda/templates/dockerCompose.md

@@ -4,12 +4,18 @@
 
 <%= cdCommand; %>
 
-Navigate to the folder in which your Dockerfile is. 
+<% if(!interrupt){ %>
+Now run docker-compose.
+<% } else { %>
+The docker container is already running.
+<% } %> 
 
-`cd <%= filePath; %>`{{execute}}
+`<% if(useDevonCommand){ %>devon<% } %> docker-compose up`{{execute T<%= terminalId; %> <% if (interrupt) { %>interrupt<% } %>}}
 
-Now you can use docker-compose up.
-
-`docker-compose up`{{execute}}
+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; %>