Spawn docker with a shell in windows for escaping json

docker · Oct 29, 2024 · ca9241a · ca9241a
1 parent ad83d34
commit ca9241a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "labs-ai-tools-vscode",
   "displayName": "Labs: AI Tools for VSCode",
   "description": "Run & Debug AI Prompts with Dockerized tools",
-  "version": "0.1.8-ghu1",
+  "version": "0.1.8-ghu2",
   "publisher": "docker",
   "repository": {
     "type": "git",

diff --git a/src/commands/runPrompt.ts b/src/commands/runPrompt.ts
@@ -172,7 +172,8 @@ export const runPrompt: (secrets: vscode.SecretStorage, mode: PromptOption) => v
         progress.report({ increment: 5, message: "Running..." });
         const ranges: Record<string, vscode.Range> = {};
         const getBaseFunctionRange = () => new vscode.Range(doc.lineCount, 0, doc.lineCount, 0);
-        await spawnPromptImage(promptOption.id, hostDir, Username || 'vscode-user', Password, process.platform, async (json) => {
+        const platformArg = process.platform === 'win32' ? 'windows' : process.platform === 'darwin' ? 'darwin' : 'linux';
+        await spawnPromptImage(promptOption.id, hostDir, Username || 'vscode-user', Password, platformArg, async (json) => {
             extensionOutput.appendLine(JSON.stringify(json))
             switch (json.method) {
                 case 'functions':

diff --git a/src/utils/promptRunner.ts b/src/utils/promptRunner.ts
@@ -115,6 +115,10 @@ export const writeKeyToVolume = async (key: string) => {
         getJSONArgForPlatform({ files: [{ path: ".openai-api-key", content: key, executable: false }] })
     ];
 
+    extensionOutput.appendLine(JSON.stringify({"write-open-ai-key-to-volume": {
+        args1, args2
+    }}));
+
     const child1 = spawn("docker", args1);
 
     child1.stdout.on('data', (data) => {
@@ -124,7 +128,9 @@ export const writeKeyToVolume = async (key: string) => {
         extensionOutput.appendLine(data.toString());
     });
 
-    const child2 = spawn("docker", args2);
+    const child2 = spawn("docker", args2, {
+        shell: process.platform === 'win32'
+    });
     child2.stdout.on('data', (data) => {
         extensionOutput.appendLine(data.toString());
     });