Use tasks to execute things instead of terminal windows

extension.bundle.ts

@@ -31,6 +31,7 @@ export { LineSplitter } from './src/debugging/coreclr/lineSplitter';
 export { delay } from './src/utils/promiseUtils';
 export { Lazy, AsyncLazy } from './src/utils/lazy';
 export { OSProvider } from './src/utils/LocalOSProvider';
+export { bufferToString } from './src/utils/spawnAsync';
 export { DockerDaemonIsLinuxPrerequisite, DockerfileExistsPrerequisite, DotNetSdkInstalledPrerequisite, LinuxUserInDockerGroupPrerequisite, MacNuGetFallbackFolderSharedPrerequisite } from './src/debugging/coreclr/prereqManager';
 export { ext } from './src/extensionVariables';
 export { globAsync } from './src/utils/globAsync';
@@ -40,7 +41,6 @@ export { inferCommand, inferPackageName, InspectMode, NodePackage } from './src/
 export { nonNullProp } from './src/utils/nonNull';
 export { getDockerOSType, isWindows10RS3OrNewer, isWindows10RS4OrNewer, isWindows10RS5OrNewer, isWindows1019H1OrNewer } from "./src/utils/osUtils";
 export { Platform, PlatformOS } from './src/utils/platform';
-export { DefaultTerminalProvider } from './src/utils/TerminalProvider';
 export { trimWithElipsis } from './src/utils/trimWithElipsis';
 export { recursiveFindTaskByType } from './src/tasks/TaskHelper';
 export { TaskDefinitionBase } from './src/tasks/TaskDefinitionBase';

package.json

@@ -2039,18 +2039,6 @@
                     ],
                     "description": "%vscode-docker.config.docker.languageserver.diagnostics.instructionWorkdirRelative%"
                 },
-                "docker.attachShellCommand.linuxContainer": {
-                    "type": "string",
-                    "default": "/bin/sh -c \"[ -e /bin/bash ] && /bin/bash || /bin/sh\"",
-                    "description": "%vscode-docker.config.docker.attachShellCommand.linuxContainer%",
-                    "deprecationMessage": "%vscode-docker.config.deprecated%"
-                },
-                "docker.attachShellCommand.windowsContainer": {
-                    "type": "string",
-                    "default": "cmd",
-                    "description": "%vscode-docker.config.docker.attachShellCommand.windowsContainer%",
-                    "deprecationMessage": "%vscode-docker.config.deprecated%"
-                },
                 "docker.dockerComposeBuild": {
                     "type": "boolean",
                     "default": true,

package.nls.json

@@ -163,8 +163,6 @@
     "vscode-docker.config.docker.languageserver.diagnostics.instructionHealthcheckMultiple": "Controls the diagnostic severity for flagging a Dockerfile with multiple HEALTHCHECK instructions",
     "vscode-docker.config.docker.languageserver.diagnostics.instructionJsonInSingleQuotes": "Controls the diagnostic severity for JSON instructions that are written incorrectly with single quotes",
     "vscode-docker.config.docker.languageserver.diagnostics.instructionWorkdirRelative": "Controls the diagnostic severity for WORKDIR instructions that do not point to an absolute path",
-    "vscode-docker.config.docker.attachShellCommand.linuxContainer": "Attach command to use for Linux containers",
-    "vscode-docker.config.docker.attachShellCommand.windowsContainer": "Attach command to use for Windows containers",
     "vscode-docker.config.docker.dockerComposeBuild": "Set to true to include --build option when docker-compose command is invoked",
     "vscode-docker.config.docker.dockerComposeDetached": "Set to true to include --d (detached) option when docker-compose command is invoked",
     "vscode-docker.config.docker.showRemoteWorkspaceWarning": "Set to true to prompt to switch from \"UI\" extension mode to \"Workspace\" extension mode if an operation is not supported in UI mode.",

src/commands/compose.ts

@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
 import { IActionContext } from 'vscode-azureextensionui';
 import { ext } from '../extensionVariables';
 import { localize } from "../localize";
+import { executeAsTask } from '../utils/executeAsTask';
 import { createFileItem, Item, quickPickDockerComposeFileItem } from '../utils/quickPickFile';
 import { quickPickWorkspaceFolder } from '../utils/quickPickWorkspaceFolder';
 import { selectComposeCommand } from './selectCommandTemplate';
@@ -30,12 +31,10 @@ async function compose(context: IActionContext, commands: ('up' | 'down')[], mes
         selectedItems = selectedItem ? [selectedItem] : [];
     }
 
-    const terminal: vscode.Terminal = ext.terminalProvider.createTerminal('Docker Compose');
     const configOptions: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('docker');
     const build: boolean = configOptions.get('dockerComposeBuild', true);
     const detached: boolean = configOptions.get('dockerComposeDetached', true);
 
-    terminal.sendText(`cd "${folder.uri.fsPath}"`);
     for (const command of commands) {
         if (selectedItems.length === 0) {
             const terminalCommand = await selectComposeCommand(
@@ -46,7 +45,7 @@ async function compose(context: IActionContext, commands: ('up' | 'down')[], mes
                 detached,
                 build
             );
-            terminal.sendText(await rewriteCommandForNewCliIfNeeded(terminalCommand));
+            await executeAsTask(context, await rewriteCommandForNewCliIfNeeded(terminalCommand), 'Docker Compose', { addDockerEnv: true, workspaceFolder: folder });
         } else {
             for (const item of selectedItems) {
                 const terminalCommand = await selectComposeCommand(
@@ -57,10 +56,9 @@ async function compose(context: IActionContext, commands: ('up' | 'down')[], mes
                     detached,
                     build
                 );
-                terminal.sendText(await rewriteCommandForNewCliIfNeeded(terminalCommand));
+                await executeAsTask(context, await rewriteCommandForNewCliIfNeeded(terminalCommand), 'Docker Compose', { addDockerEnv: true, workspaceFolder: folder });
             }
         }
-        terminal.show();
     }
 }
 

src/commands/containers/attachShellContainer.ts

@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import * as vscode from 'vscode';
 import { IActionContext } from 'vscode-azureextensionui';
 import { DockerOSType } from '../../docker/Common';
 import { ext } from '../../extensionVariables';
 import { localize } from '../../localize';
 import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';
-import { getDockerOSType } from '../../utils/osUtils';
+import { executeAsTask } from '../../utils/executeAsTask';
+import { execAsync } from '../../utils/spawnAsync';
 import { selectAttachCommand } from '../selectCommandTemplate';
 
 export async function attachShellContainer(context: IActionContext, node?: ContainerTreeItem): Promise<void> {
@@ -21,25 +21,38 @@ export async function attachShellContainer(context: IActionContext, node?: Conta
         });
     }
 
+    let shellCommand: string;
     let osType: DockerOSType;
     try {
-        // TODO: get OS type from container instead of from system
-        osType = await getDockerOSType(context);
+        osType = (await ext.dockerClient.inspectContainer(context, node.containerId))?.Platform || 'linux';
     } catch {
-        // Assume linux
+        // Assume Linux if the above fails
         osType = 'linux';
     }
 
     context.telemetry.properties.dockerOSType = osType;
 
-    let shellCommand: string;
-    const configOptions: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('docker');
     if (osType === 'windows') {
-        shellCommand = configOptions.get('attachShellCommand.windowsContainer');
+        // On Windows containers, always use cmd
+        shellCommand = 'cmd';
     } else {
-        shellCommand = configOptions.get('attachShellCommand.linuxContainer');
+        const currentContext = await ext.dockerContextManager.getCurrentContext();
+
+        if (currentContext.Type === 'aci') {
+            // If it's ACI we have to do sh, because it's not possible to check if bash is present
+            shellCommand = 'sh';
+        } else {
+            // On Linux containers, check if bash is present
+            // If so use it, otherwise use sh
+            try {
+                // If this succeeds, bash is present (exit code 0)
+                await execAsync(`docker exec -i ${node.containerId} sh -c "which bash"`);
+                shellCommand = 'bash';
+            } catch {
+                shellCommand = 'sh';
+            }
+        }
     }
-    context.telemetry.properties.shellCommand = shellCommand;
 
     const terminalCommand = await selectAttachCommand(
         context,
@@ -49,7 +62,5 @@ export async function attachShellContainer(context: IActionContext, node?: Conta
         shellCommand
     );
 
-    const terminal = ext.terminalProvider.createTerminal(`Shell: ${node.containerName}`);
-    terminal.sendText(terminalCommand);
-    terminal.show();
+    await executeAsTask(context, terminalCommand, `Shell: ${node.containerName}`, { addDockerEnv: true });
 }

src/commands/containers/viewContainerLogs.ts

@@ -7,6 +7,7 @@ import { IActionContext } from 'vscode-azureextensionui';
 import { ext } from '../../extensionVariables';
 import { localize } from '../../localize';
 import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';
+import { executeAsTask } from '../../utils/executeAsTask';
 import { selectLogsCommand } from '../selectCommandTemplate';
 
 export async function viewContainerLogs(context: IActionContext, node?: ContainerTreeItem): Promise<void> {
@@ -25,7 +26,5 @@ export async function viewContainerLogs(context: IActionContext, node?: Containe
         node.containerId
     );
 
-    const terminal = ext.terminalProvider.createTerminal(node.fullTag);
-    terminal.sendText(terminalCommand);
-    terminal.show();
+    await executeAsTask(context, terminalCommand, node.fullTag, { addDockerEnv: true });
 }

src/commands/dockerInstaller.ts

@@ -11,6 +11,7 @@ import { OSTempFileProvider } from '../debugging/coreclr/tempFileProvider';
 import { ext } from '../extensionVariables';
 import { localize } from '../localize';
 import { dockerInstallStatusProvider } from '../utils/DockerInstallStatusProvider';
+import { executeAsTask } from '../utils/executeAsTask';
 import { streamToFile } from '../utils/httpRequest';
 import LocalOSProvider from '../utils/LocalOSProvider';
 import { openExternal } from '../utils/openExternal';
@@ -45,7 +46,7 @@ export abstract class DockerInstallerBase {
             // eslint-disable-next-line @typescript-eslint/no-floating-promises
             vscode.window.showInformationMessage(installationMessage);
             try {
-                await this.install(downloadedFileName, command);
+                await this.install(context, downloadedFileName, command);
             } catch (error) {
                 const message = `${localize('vscode-docker.commands.DockerInstallerBase.installFailed', 'Docker Desktop installation failed')}. ${error}`;
                 const title = localize('vscode-docker.commands.DockerInstallerBase.openInstallLink', 'Install Instruction');
@@ -83,7 +84,7 @@ export abstract class DockerInstallerBase {
         context.errorHandling.suppressDisplay = true;
     }
 
-    protected abstract install(fileName: string, cmd: string): Promise<void>;
+    protected abstract install(context: IActionContext, fileName: string, cmd: string): Promise<void>;
 }
 
 export class WindowsDockerInstaller extends DockerInstallerBase {
@@ -94,7 +95,7 @@ export class WindowsDockerInstaller extends DockerInstallerBase {
         return `"${fileName}"`;
     }
 
-    protected async install(fileName: string, cmd: string): Promise<void> {
+    protected async install(context: IActionContext, fileName: string, cmd: string): Promise<void> {
         const fsProvider = new LocalFileSystemProvider();
         try {
             ext.outputChannel.appendLine(localize('vscode-docker.commands.DockerInstallerBase.downloadCompleteMessage', 'Executing command {0}', cmd));
@@ -114,11 +115,11 @@ export class MacDockerInstaller extends DockerInstallerBase {
         return `chmod +x '${fileName}' && open '${fileName}'`;
     }
 
-    protected async install(fileName: string): Promise<void> {
-        const terminal = ext.terminalProvider.createTerminal(localize('vscode-docker.commands.MacDockerInstaller.terminalTitle', 'Docker Install'));
+    protected async install(context: IActionContext, fileName: string): Promise<void> {
+        const title = localize('vscode-docker.commands.MacDockerInstaller.terminalTitle', 'Docker Install');
         const command = this.getInstallCommand(fileName);
-        terminal.sendText(command);
-        terminal.show();
+
+        await executeAsTask(context, command, title, { addDockerEnv: false });
     }
 }
 

src/commands/images/buildImage.ts

@@ -9,6 +9,7 @@ import { IActionContext } from "vscode-azureextensionui";
 import { ext } from "../../extensionVariables";
 import { localize } from '../../localize';
 import { getOfficialBuildTaskForDockerfile } from "../../tasks/TaskHelper";
+import { executeAsTask } from "../../utils/executeAsTask";
 import { getValidImageName } from "../../utils/getValidImageName";
 import { delay } from "../../utils/promiseUtils";
 import { quickPickDockerFileItem } from "../../utils/quickPickFile";
@@ -64,8 +65,6 @@ export async function buildImage(context: IActionContext, dockerFileUri: vscode.
             terminalCommand = terminalCommand.replace(tagRegex, imageName);
         }
 
-        const terminal: vscode.Terminal = ext.terminalProvider.createTerminal('Docker');
-        terminal.sendText(terminalCommand);
-        terminal.show();
+        await executeAsTask(context, terminalCommand, 'Docker', { addDockerEnv: true, workspaceFolder: rootFolder });
     }
 }

src/commands/images/pullImage.ts

@@ -7,6 +7,7 @@ import { IActionContext } from 'vscode-azureextensionui';
 import { ext } from '../../extensionVariables';
 import { localize } from '../../localize';
 import { ImageTreeItem } from '../../tree/images/ImageTreeItem';
+import { executeAsTask } from '../../utils/executeAsTask';
 import { multiSelectNodes } from '../../utils/multiSelectNodes';
 
 export async function pullImage(context: IActionContext, node?: ImageTreeItem, nodes?: ImageTreeItem[]): Promise<void> {
@@ -18,9 +19,7 @@ export async function pullImage(context: IActionContext, node?: ImageTreeItem, n
         nodes
     );
 
-    const terminal = ext.terminalProvider.createTerminal("docker pull");
-    terminal.show();
     for (const n of nodes) {
-        terminal.sendText(`docker pull ${n.fullTag}`);
+        await executeAsTask(context, `docker pull ${n.fullTag}`, 'docker pull', { addDockerEnv: true });
     }
 }

src/commands/images/pushImage.ts

@@ -10,6 +10,7 @@ import { localize } from '../../localize';
 import { ImageTreeItem } from '../../tree/images/ImageTreeItem';
 import { registryExpectedContextValues } from '../../tree/registries/registryContextValues';
 import { RegistryTreeItemBase } from '../../tree/registries/RegistryTreeItemBase';
+import { executeAsTask } from '../../utils/executeAsTask';
 import { addImageTaggingTelemetry, tagImage } from './tagImage';
 
 export async function pushImage(context: IActionContext, node: ImageTreeItem | undefined): Promise<void> {
@@ -65,9 +66,7 @@ export async function pushImage(context: IActionContext, node: ImageTreeItem | u
     addImageTaggingTelemetry(context, finalTag, '');
 
     // Finally push the image
-    const terminal = ext.terminalProvider.createTerminal(finalTag);
-    terminal.sendText(`docker push ${finalTag}`);
-    terminal.show();
+    await executeAsTask(context, `docker push ${finalTag}`, finalTag, { addDockerEnv: true });
 }
 
 async function tryGetConnectedRegistryForPath(context: IActionContext, baseImagePath: string): Promise<RegistryTreeItemBase | undefined> {

src/commands/images/runAzureCliImage.ts

@@ -7,8 +7,8 @@ import * as fse from 'fs-extra';
 import * as os from 'os';
 import * as vscode from 'vscode';
 import { DialogResponses, IActionContext } from 'vscode-azureextensionui';
-import { ext } from '../../extensionVariables';
 import { localize } from '../../localize';
+import { executeAsTask } from '../../utils/executeAsTask';
 import { openExternal } from '../../utils/openExternal';
 import { getDockerOSType } from '../../utils/osUtils';
 
@@ -38,9 +38,6 @@ export async function runAzureCliImage(context: IActionContext): Promise<void> {
             vol += ` -v ${homeDir}/.kube:/root/.kube`;
         }
 
-        const cmd: string = `docker run ${option} ${vol.trim()} -it --rm azuresdk/azure-cli-python:latest`;
-        const terminal: vscode.Terminal = ext.terminalProvider.createTerminal('Azure CLI');
-        terminal.sendText(cmd);
-        terminal.show();
+        await executeAsTask(context, `docker run ${option} ${vol.trim()} -it --rm azuresdk/azure-cli-python:latest`, 'Azure CLI', { addDockerEnv: true });
     }
 }

src/commands/images/runImage.ts

@@ -7,6 +7,7 @@ import { IActionContext } from 'vscode-azureextensionui';
 import { ext } from '../../extensionVariables';
 import { localize } from '../../localize';
 import { ImageTreeItem } from '../../tree/images/ImageTreeItem';
+import { executeAsTask } from '../../utils/executeAsTask';
 import { selectRunCommand } from '../selectCommandTemplate';
 
 export async function runImage(context: IActionContext, node?: ImageTreeItem): Promise<void> {
@@ -35,7 +36,5 @@ async function runImageCore(context: IActionContext, node: ImageTreeItem | undef
         inspectInfo?.Config?.ExposedPorts
     );
 
-    const terminal = ext.terminalProvider.createTerminal(node.fullTag);
-    terminal.sendText(terminalCommand);
-    terminal.show();
+    await executeAsTask(context, terminalCommand, node.fullTag, { addDockerEnv: true });
 }

src/commands/registries/logOutOfDockerCli.ts

@@ -3,19 +3,17 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Terminal } from 'vscode';
 import { IActionContext } from 'vscode-azureextensionui';
 import { ext } from '../../extensionVariables';
 import { registryExpectedContextValues } from '../../tree/registries/registryContextValues';
 import { RegistryTreeItemBase } from '../../tree/registries/RegistryTreeItemBase';
+import { executeAsTask } from '../../utils/executeAsTask';
 
 export async function logOutOfDockerCli(context: IActionContext, node?: RegistryTreeItemBase): Promise<void> {
     if (!node) {
         node = await ext.registriesTree.showTreeItemPicker<RegistryTreeItemBase>(registryExpectedContextValues.all.registry, context);
     }
 
     let creds = await node.getDockerCliCredentials();
-    const terminal: Terminal = ext.terminalProvider.createTerminal('docker logout');
-    terminal.sendText(`docker logout ${creds.registryPath}`);
-    terminal.show();
+    await executeAsTask(context, `docker logout ${creds.registryPath}`, 'Docker', { addDockerEnv: true });
 }

src/commands/registries/pullImages.ts

@@ -3,13 +3,13 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { Terminal } from "vscode";
 import { IActionContext } from "vscode-azureextensionui";
 import { ext } from '../../extensionVariables';
 import { registryExpectedContextValues } from "../../tree/registries/registryContextValues";
 import { RegistryTreeItemBase } from '../../tree/registries/RegistryTreeItemBase';
 import { RemoteRepositoryTreeItemBase } from "../../tree/registries/RemoteRepositoryTreeItemBase";
 import { RemoteTagTreeItem } from '../../tree/registries/RemoteTagTreeItem';
+import { executeAsTask } from "../../utils/executeAsTask";
 import { logInToDockerCli } from "./logInToDockerCli";
 
 export async function pullRepository(context: IActionContext, node?: RemoteRepositoryTreeItemBase): Promise<void> {
@@ -31,7 +31,5 @@ export async function pullImageFromRepository(context: IActionContext, node?: Re
 async function pullImages(context: IActionContext, node: RegistryTreeItemBase, imageRequest: string): Promise<void> {
     await logInToDockerCli(context, node);
 
-    const terminal: Terminal = ext.terminalProvider.createTerminal("docker pull");
-    terminal.show();
-    terminal.sendText(`docker pull ${node.baseImagePath}/${imageRequest}`);
+    await executeAsTask(context, `docker pull ${node.baseImagePath}/${imageRequest}`, 'Docker', { addDockerEnv: true });
 }