Use docker compose command if present (#1057)

Author: isc-bsaviano

src/commands/serverActions.ts

@@ -104,14 +104,14 @@ export async function serverActions(): Promise<void> {
     actions.push({
       id: "openDockerTerminal",
       label: "Open Terminal in Docker",
-      detail: "Use docker-compose to start session inside configured service",
+      detail: "Use Docker Compose to start session inside configured service",
     });
   }
   if (workspaceState.get(workspaceFolder.toLowerCase() + ":docker", false)) {
     actions.push({
       id: "openDockerShell",
       label: "Open Shell in Docker",
-      detail: "Use docker-compose to start shell inside configured service",
+      detail: "Use Docker Compose to start shell inside configured service",
     });
   }
   actions.push({

src/utils/index.ts

@@ -397,6 +397,20 @@ export function notNull(el: any): boolean {
   return el !== null;
 }
 
+/** Determine the compose command to use (`docker-compose` or `docker compose`).  */
+async function composeCommand(cwd?: string): Promise<string> {
+  return new Promise<string>((resolve) => {
+    let cmd = "docker compose";
+    exec(`${cmd} version`, { cwd }, (error) => {
+      if (error) {
+        // 'docker compose' is not present, so default to 'docker-compose'
+        cmd = "docker-compose";
+      }
+      resolve(cmd);
+    });
+  });
+}
+
 export async function portFromDockerCompose(): Promise<{ port: number; docker: boolean; service?: string }> {
   // When running remotely, behave as if there is no docker-compose object within objectscript.conn
   if (extensionContext.extension.extensionKind === vscode.ExtensionKind.Workspace) {
@@ -432,8 +446,7 @@ export async function portFromDockerCompose(): Promise<{ port: number; docker: b
   }
 
   const envFileParam = envFile ? `--env-file ${envFile}` : "";
-  const exe = process.platform === "win32" ? "docker-compose.exe" : "docker-compose";
-  const cmd = `${exe} -f ${file} ${envFileParam} `;
+  const cmd = `${await composeCommand(cwd)} -f ${file} ${envFileParam} `;
 
   return new Promise((resolve, reject) => {
     exec(`${cmd} ps --services --filter status=running`, { cwd }, (error, stdout) => {
@@ -466,17 +479,27 @@ export async function terminalWithDocker(): Promise<vscode.Terminal> {
   const terminalName = `ObjectScript:${workspace}`;
   let terminal = terminals.find((t) => t.name == terminalName && t.exitStatus == undefined);
   if (!terminal) {
-    const exe = process.platform === "win32" ? "docker-compose.exe" : "docker-compose";
-    terminal = vscode.window.createTerminal(terminalName, exe, [
-      "-f",
-      file,
-      "exec",
-      service,
-      "/bin/bash",
-      "-c",
-      `[ -f /tmp/vscodesession.pid ] && kill $(cat /tmp/vscodesession.pid) >/dev/null 2>&1 ; echo $$ > /tmp/vscodesession.pid;
+    let exe = await composeCommand();
+    const argsArr: string[] = [];
+    if (exe == "docker compose") {
+      const exeSplit = exe.split(" ");
+      exe = exeSplit[0];
+      argsArr.push(exeSplit[1]);
+    }
+    terminal = vscode.window.createTerminal(
+      terminalName,
+      exe,
+      argsArr.concat([
+        "-f",
+        file,
+        "exec",
+        service,
+        "/bin/bash",
+        "-c",
+        `[ -f /tmp/vscodesession.pid ] && kill $(cat /tmp/vscodesession.pid) >/dev/null 2>&1 ; echo $$ > /tmp/vscodesession.pid;
         $(command -v ccontrol || command -v iris) session $ISC_PACKAGE_INSTANCENAME -U ${ns}`,
-    ]);
+      ])
+    );
     terminals.push(terminal);
   }
   terminal.show(true);
@@ -491,8 +514,18 @@ export async function shellWithDocker(): Promise<vscode.Terminal> {
   const terminalName = `Shell:${workspace}`;
   let terminal = terminals.find((t) => t.name == terminalName && t.exitStatus == undefined);
   if (!terminal) {
-    const exe = process.platform === "win32" ? "docker-compose.exe" : "docker-compose";
-    terminal = vscode.window.createTerminal(terminalName, exe, ["-f", file, "exec", service, "/bin/bash"]);
+    let exe = await composeCommand();
+    const argsArr: string[] = [];
+    if (exe == "docker compose") {
+      const exeSplit = exe.split(" ");
+      exe = exeSplit[0];
+      argsArr.push(exeSplit[1]);
+    }
+    terminal = vscode.window.createTerminal(
+      terminalName,
+      exe,
+      argsArr.concat(["-f", file, "exec", service, "/bin/bash"])
+    );
     terminals.push(terminal);
   }
   terminal.show(true);