From 7e0416125febd6203ceb7542a95895e7ae659002 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 10 Nov 2020 09:21:53 -0500 Subject: [PATCH 01/13] Set the Python argument to force python3 --- src/debugging/python/PythonDebugHelper.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/debugging/python/PythonDebugHelper.ts b/src/debugging/python/PythonDebugHelper.ts index a69b9f465b..2a2a199c68 100644 --- a/src/debugging/python/PythonDebugHelper.ts +++ b/src/debugging/python/PythonDebugHelper.ts @@ -101,7 +101,8 @@ export class PythonDebugHelper implements DebugHelper { program: debugConfiguration.file || pythonRunTaskOptions.file, redirectOutput: debugConfiguration.redirectOutput || true, args: args, - cwd: '.' + cwd: '.', + python: 'python3', // This controls what Python path gets used by the launcher to launch the debuggee. In a container we should always use `python3` to launch it. }; } From 15cd8c48bf5ee3bba51e32eca6a5975c67073bb4 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 10 Nov 2020 09:23:17 -0500 Subject: [PATCH 02/13] Comment to update the min Python version --- src/tasks/python/PythonExtensionHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/python/PythonExtensionHelper.ts b/src/tasks/python/PythonExtensionHelper.ts index 52de903c30..77305f0c78 100644 --- a/src/tasks/python/PythonExtensionHelper.ts +++ b/src/tasks/python/PythonExtensionHelper.ts @@ -36,7 +36,7 @@ export namespace PythonExtensionHelper { export async function getPythonExtension(): Promise> | undefined { const pyExtensionId = 'ms-python.python'; - const minPyExtensionVersion = new semver.SemVer('2020.5.78807'); + const minPyExtensionVersion = new semver.SemVer('2020.5.78807'); // TODO const pyExt = vscode.extensions.getExtension(pyExtensionId); const button = localize('vscode-docker.tasks.pythonExt.openExtension', 'Open Extension'); From b3255a91e5cadee44790580fd9223d66e39ad875 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 10 Nov 2020 11:40:07 -0500 Subject: [PATCH 03/13] Missed a semicolon --- src/docker/ContextManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docker/ContextManager.ts b/src/docker/ContextManager.ts index c3dc94da6e..f2ee1a4ef8 100644 --- a/src/docker/ContextManager.ts +++ b/src/docker/ContextManager.ts @@ -253,7 +253,7 @@ export class DockerContextManager implements ContextManager, Disposable { try { if (isNewContextType(currentContext.ContextType)) { - actionContext.telemetry.properties.hostProtocol = currentContext.ContextType + actionContext.telemetry.properties.hostProtocol = currentContext.ContextType; } else { actionContext.telemetry.properties.hostProtocol = new URL(currentContext.DockerEndpoint).protocol; } From f9d5827f8f3e02bde9d576c21f63ecc220401f5a Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 10 Nov 2020 12:43:22 -0500 Subject: [PATCH 04/13] New minimum Python extension version --- src/tasks/python/PythonExtensionHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/python/PythonExtensionHelper.ts b/src/tasks/python/PythonExtensionHelper.ts index 77305f0c78..7beefc51f4 100644 --- a/src/tasks/python/PythonExtensionHelper.ts +++ b/src/tasks/python/PythonExtensionHelper.ts @@ -36,7 +36,7 @@ export namespace PythonExtensionHelper { export async function getPythonExtension(): Promise> | undefined { const pyExtensionId = 'ms-python.python'; - const minPyExtensionVersion = new semver.SemVer('2020.5.78807'); // TODO + const minPyExtensionVersion = new semver.SemVer('2020.11.0'); const pyExt = vscode.extensions.getExtension(pyExtensionId); const button = localize('vscode-docker.tasks.pythonExt.openExtension', 'Open Extension'); From 24d6dad88e8c607448c0544c562dcaf5e2853166 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Thu, 12 Nov 2020 12:37:22 -0500 Subject: [PATCH 05/13] Bump minver --- src/tasks/python/PythonExtensionHelper.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tasks/python/PythonExtensionHelper.ts b/src/tasks/python/PythonExtensionHelper.ts index 7beefc51f4..6a8b71649c 100644 --- a/src/tasks/python/PythonExtensionHelper.ts +++ b/src/tasks/python/PythonExtensionHelper.ts @@ -36,7 +36,7 @@ export namespace PythonExtensionHelper { export async function getPythonExtension(): Promise> | undefined { const pyExtensionId = 'ms-python.python'; - const minPyExtensionVersion = new semver.SemVer('2020.11.0'); + const minPyExtensionVersion = new semver.SemVer('2020.11.358366027'); // One patch version # higher than the just-released, still-affected build const pyExt = vscode.extensions.getExtension(pyExtensionId); const button = localize('vscode-docker.tasks.pythonExt.openExtension', 'Open Extension'); From 9d22319e08a3def709e0d0f28f2fc130a77d0d35 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 17 Nov 2020 11:46:12 -0500 Subject: [PATCH 06/13] Version and changelog updates --- CHANGELOG.md | 4 ++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45380bedb1..29f1318b08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 1.8.1 - 17 November 2020 +### Fixed +* This update fixes an issue that prevented debugging Python applications in Docker containers. The latest version of the Python extension is also required. [#2455](https://github.com/microsoft/vscode-docker/issues/2455) + ## 1.8.0 - 16 November 2020 ### Added * Added a read-only file explorer for running containers, this can be seen in the Docker Explorer tab. [#2333](https://github.com/microsoft/vscode-docker/issues/2333) diff --git a/package-lock.json b/package-lock.json index 072666b9cc..34899acb57 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "vscode-docker", - "version": "1.8.0", + "version": "1.8.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 385c9d0a20..3863848ea0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vscode-docker", - "version": "1.8.0", + "version": "1.8.1", "publisher": "ms-azuretools", "displayName": "Docker", "description": "Makes it easy to create, manage, and debug containerized applications.", From ea4b158ee7f1275db3113bb1132728b34eb60332 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 17 Nov 2020 13:28:33 -0500 Subject: [PATCH 07/13] Update banner color --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3863848ea0..0e2105a804 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "icon": "resources/docker_blue.png", "aiKey": "AIF-d9b70cd4-b9f9-4d70-929b-a071c400b217", "galleryBanner": { - "color": "#1289B9", + "color": "#1e1e1e", "theme": "dark" }, "categories": [ From c33b18bbcad50c3d56b6409b862425ef8dec3d75 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 17 Nov 2020 13:38:25 -0500 Subject: [PATCH 08/13] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29f1318b08..eefc4ee953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 1.8.1 - 17 November 2020 ### Fixed * This update fixes an issue that prevented debugging Python applications in Docker containers. The latest version of the Python extension is also required. [#2455](https://github.com/microsoft/vscode-docker/issues/2455) +* Fixed an issue where the logo was hard to see in the [extension gallery page](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) in the browser. [#2499](https://github.com/microsoft/vscode-docker/issues/2499) ## 1.8.0 - 16 November 2020 ### Added From 371fd154e1b911b8208fe23656d3350048860e6c Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Tue, 17 Nov 2020 17:21:12 -0500 Subject: [PATCH 09/13] Bump min version and update changelog --- CHANGELOG.md | 2 +- src/tasks/python/PythonExtensionHelper.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eefc4ee953..bdfb75f493 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.8.1 - 17 November 2020 +## 1.8.1 - 18 November 2020 ### Fixed * This update fixes an issue that prevented debugging Python applications in Docker containers. The latest version of the Python extension is also required. [#2455](https://github.com/microsoft/vscode-docker/issues/2455) * Fixed an issue where the logo was hard to see in the [extension gallery page](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) in the browser. [#2499](https://github.com/microsoft/vscode-docker/issues/2499) diff --git a/src/tasks/python/PythonExtensionHelper.ts b/src/tasks/python/PythonExtensionHelper.ts index 6a8b71649c..a3731289b4 100644 --- a/src/tasks/python/PythonExtensionHelper.ts +++ b/src/tasks/python/PythonExtensionHelper.ts @@ -36,7 +36,7 @@ export namespace PythonExtensionHelper { export async function getPythonExtension(): Promise> | undefined { const pyExtensionId = 'ms-python.python'; - const minPyExtensionVersion = new semver.SemVer('2020.11.358366027'); // One patch version # higher than the just-released, still-affected build + const minPyExtensionVersion = new semver.SemVer('2020.11.367453362'); const pyExt = vscode.extensions.getExtension(pyExtensionId); const button = localize('vscode-docker.tasks.pythonExt.openExtension', 'Open Extension'); From 9920863329df101a422584a3b1221d9a5ce49533 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Thu, 19 Nov 2020 09:55:51 -0500 Subject: [PATCH 10/13] Use new approach --- src/debugging/python/PythonDebugHelper.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/debugging/python/PythonDebugHelper.ts b/src/debugging/python/PythonDebugHelper.ts index 2a2a199c68..65e0b14caa 100644 --- a/src/debugging/python/PythonDebugHelper.ts +++ b/src/debugging/python/PythonDebugHelper.ts @@ -102,7 +102,22 @@ export class PythonDebugHelper implements DebugHelper { redirectOutput: debugConfiguration.redirectOutput || true, args: args, cwd: '.', - python: 'python3', // This controls what Python path gets used by the launcher to launch the debuggee. In a container we should always use `python3` to launch it. + + /* eslint-disable no-template-curly-in-string */ + // These settings control what Python interpreter gets used in what circumstance. + // debugAdapterPython controls the interpreter used to launch the adapter, on the local client + // We want it to use what it would normally use for local Python debugging, i.e. the chosen local interpreter + debugAdapterPython: '${command:python.interpreterPath}', + + // debugLauncherPython controls the interpreter used to launch the launcher, also on the local client + // We want it to use what it would normally use for local Python debugging, i.e. the chosen local interpreter + // This actually launches our launcher in resources/python/launcher.py, which uses `docker exec -d python3 /debugpy/launcher ...` to launch the real debugpy launcher in the container + debugLauncherPython: '${command:python.interpreterPath}', + /* eslint-enable no-template-curly-in-string */ + + // python controls the interpreter used to launch the application itself + // Since this is in the container it should always use `python3` + python: 'python3', }; } From 0401c3bbc1f74ad1491328af09b3f76bca500639 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Thu, 19 Nov 2020 10:02:46 -0500 Subject: [PATCH 11/13] Comment updates --- src/debugging/python/PythonDebugHelper.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/debugging/python/PythonDebugHelper.ts b/src/debugging/python/PythonDebugHelper.ts index 65e0b14caa..dc26d75286 100644 --- a/src/debugging/python/PythonDebugHelper.ts +++ b/src/debugging/python/PythonDebugHelper.ts @@ -105,17 +105,17 @@ export class PythonDebugHelper implements DebugHelper { /* eslint-disable no-template-curly-in-string */ // These settings control what Python interpreter gets used in what circumstance. - // debugAdapterPython controls the interpreter used to launch the adapter, on the local client + // debugAdapterPython controls the interpreter used by the Python extension to start the debug adapter, on the local client // We want it to use what it would normally use for local Python debugging, i.e. the chosen local interpreter debugAdapterPython: '${command:python.interpreterPath}', - // debugLauncherPython controls the interpreter used to launch the launcher, also on the local client + // debugLauncherPython controls the interpreter used by the debug adapter to start the launcher, also on the local client // We want it to use what it would normally use for local Python debugging, i.e. the chosen local interpreter // This actually launches our launcher in resources/python/launcher.py, which uses `docker exec -d python3 /debugpy/launcher ...` to launch the real debugpy launcher in the container debugLauncherPython: '${command:python.interpreterPath}', /* eslint-enable no-template-curly-in-string */ - // python controls the interpreter used to launch the application itself + // python controls the interpreter used by the launcher to start the application itself // Since this is in the container it should always use `python3` python: 'python3', }; From 77aa77699fa19801477868fc09eca9e610beb0ac Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Thu, 19 Nov 2020 10:04:08 -0500 Subject: [PATCH 12/13] Changelog update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdfb75f493..dd02f2f5a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ## 1.8.1 - 18 November 2020 ### Fixed -* This update fixes an issue that prevented debugging Python applications in Docker containers. The latest version of the Python extension is also required. [#2455](https://github.com/microsoft/vscode-docker/issues/2455) +* This update fixes an issue that prevented debugging Python applications in Docker containers. The latest version of the [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) is also required. [#2455](https://github.com/microsoft/vscode-docker/issues/2455) * Fixed an issue where the logo was hard to see in the [extension gallery page](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) in the browser. [#2499](https://github.com/microsoft/vscode-docker/issues/2499) ## 1.8.0 - 16 November 2020 From f42048fd0730b9cc86c5acf883c72d0b2919c667 Mon Sep 17 00:00:00 2001 From: "Brandon Waterloo [MSFT]" <36966225+bwateratmsft@users.noreply.github.com> Date: Fri, 20 Nov 2020 13:46:00 -0500 Subject: [PATCH 13/13] Date in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dd02f2f5a6..322b2e6291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -## 1.8.1 - 18 November 2020 +## 1.8.1 - 23 November 2020 ### Fixed * This update fixes an issue that prevented debugging Python applications in Docker containers. The latest version of the [Python extension](https://marketplace.visualstudio.com/items?itemName=ms-python.python) is also required. [#2455](https://github.com/microsoft/vscode-docker/issues/2455) * Fixed an issue where the logo was hard to see in the [extension gallery page](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) in the browser. [#2499](https://github.com/microsoft/vscode-docker/issues/2499)