Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Windows support for shell attach #58

Merged
merged 2 commits into from
Jan 31, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions commands/open-shell-container.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import vscode = require('vscode');
import * as vscode from 'vscode';
import {ContainerItem, quickPickContainer} from './utils/quick-pick-container';
import {DockerEngineType, docker} from './utils/docker-endpoint';

const engineTypeShellCommands = {
[DockerEngineType.Linux]: "/bin/sh",
[DockerEngineType.Windows]: "cmd"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this default to Powershell instead? I'd love to hear feedback here.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep hearing rumor (I have no inside knowledge one way or another..even though I couldn't share it anyway) that Windows is making the switch themselves, but I question whether that would be accepted in general. I think as long as this was an option for the extension, though, you could default to whatever you want.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here is the blog post: https://blogs.windows.com/windowsexperience/2016/11/17/announcing-windows-10-insider-preview-build-14971-for-pc/#hjIQ7kQcdSPrzb1z.97

Given this, i suggest we default to PowerShell instead of cmd.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@chrisdias Sounds good to me! I'll make this change.

}

export function openShellContainer() {
quickPickContainer().then(function (selectedItem: ContainerItem) {
quickPickContainer().then((selectedItem: ContainerItem) => {
if (selectedItem) {
let terminal = vscode.window.createTerminal(`sh ${selectedItem.label}`);
terminal.sendText(`docker exec -it ${selectedItem.ids[0]} /bin/sh`);
terminal.show();
docker.getEngineType().then((engineType: DockerEngineType) => {
const terminal = vscode.window.createTerminal(`Shell: ${selectedItem.label}`);
terminal.sendText(`docker exec -it ${selectedItem.ids[0]} ${engineTypeShellCommands[engineType]}`);
terminal.show();
});
}
});
}
23 changes: 22 additions & 1 deletion commands/utils/docker-endpoint.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import * as Docker from 'dockerode';

export enum DockerEngineType {
Linux,
Windows
}

class DockerClient {

private endPoint:Docker;

constructor() {
Expand Down Expand Up @@ -39,6 +42,24 @@ class DockerClient {
return this.endPoint.getContainer(id);
}

public getEngineType() : Thenable<DockerEngineType> {
if (process.platform === 'win32') {
return new Promise((resolve, reject) => {
this.endPoint.info((error, info) => {
if (error) {
return reject(error);
}

return resolve(info.OSType === "windows" ? DockerEngineType.Windows : DockerEngineType.Linux);
});
});
};

// On Linux or macOS, this can only ever be linux,
// so short-circuit the Docker call entirely.
return Promise.resolve(DockerEngineType.Linux);
}

public getImage(id:string): Docker.Image {
return this.endPoint.getImage(id);
}
Expand Down
7 changes: 6 additions & 1 deletion typings/dockerode.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ declare module Docker {
stdin?: boolean;
}

interface EngineInfo {
OSType: string;
}

interface ExecInspectData {
ExitCode: number;
}
Expand Down Expand Up @@ -69,11 +73,12 @@ declare module Docker {
}
}


declare class Docker {
modem: Docker.Modem;
constructor(options: Docker.DockerOptions);

info(cb: (err: Error, data: Docker.EngineInfo) => void): void;

listImages(cb: (err:Error , images: Docker.ImageDesc[])=>void): void;
getImage(id:string): Docker.Image;

Expand Down