Revert "Dev Container Using MCR (#21675)"

This reverts commit 6af959d.

Author: Kartik Raj

.devcontainer/Dockerfile

@@ -1,18 +1,26 @@
-FROM mcr.microsoft.com/devcontainers/typescript-node:16-bookworm
+# This image will serve as a starting point for devcontainer.json.
+# Get latest image of Fedora as the base image.
+FROM docker.io/library/fedora:latest
 
-RUN apt-get install -y wget bzip2
+# Install supported python versions and nodejs.
+RUN dnf -y --nodocs install /usr/bin/{python3.7,python3.8,python3.9,python3.10,python3.11,git,conda,clang} && \
+    dnf clean all
 
-# Run in silent mode and save downloaded script as anaconda.sh.
-# Run with /bin/bash and run in silent mode to /opt/conda.
-# Also get rid of installation script after finishing.
-RUN wget --quiet https://repo.anaconda.com/archive/Anaconda3-2023.07-1-Linux-x86_64.sh -O ~/anaconda.sh && \
-    /bin/bash ~/anaconda.sh -b -p /opt/conda && \
-    rm ~/anaconda.sh
+ENV NVM_VERSION=0.39.3
+ENV NODE_VERSION=16.17.1
+ENV NPM_VERSION=8.19.3
+
+# Installation instructions from https://github.com/nvm-sh/nvm .
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v$NVM_VERSION/install.sh | bash
+RUN export NVM_DIR="$HOME/.nvm" && \
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" && \
+    [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" && \
+    nvm install $NODE_VERSION && \
+    npm install -g npm@$NPM_VERSION
+
+# For clean open source builds.
+ENV DISABLE_TRANSLATIONS=true
 
-ENV PATH="/opt/conda/bin:$PATH"
 
-# Sudo apt update needs to run in order for installation of fish to work .
-RUN sudo apt update && \
-    sudo apt install fish -y
 
 

.devcontainer/devcontainer.json

@@ -21,8 +21,7 @@
     },
     // Commands to execute on container creation,start.
     "postCreateCommand": "bash scripts/postCreateCommand.sh",
-    "onCreateCommand": "bash scripts/onCreateCommand.sh",
-
+    // Environment variable placed inside containerEnv following: https://containers.dev/implementors/json_reference/#general-properties
     "containerEnv": {
         "CI_PYTHON_PATH": "/workspaces/vscode-python/.venv/bin/python"
     }

scripts/onCreateCommand.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+npm ci
+# Create Virutal environment.
+python3.7 -m venv /workspaces/vscode-python/.venv
+
+# Activate Virtual environment.
+source /workspaces/vscode-python/.venv/bin/activate
+
+# Install required Python libraries.
+npx gulp installPythonLibs
+
+# Install testing requirement using python in .venv .
+/workspaces/vscode-python/.venv/bin/python -m pip install -r build/test-requirements.txt
+/workspaces/vscode-python/.venv/bin/python -m pip install -r build/smoke-test-requirements.txt
+/workspaces/vscode-python/.venv/bin/python -m pip install -r build/functional-test-requirements.txt

scripts/postCreateCommand.sh

@@ -30,7 +30,7 @@ export const isRemoteGlobalSettingCopiedKey = 'isRemoteGlobalSettingCopiedKey';
 export const defaultInterpreterPathSetting: keyof IPythonSettings = 'defaultInterpreterPath';
 const CI_PYTHON_PATH = getCIPythonPath();
 
-export function getCIPythonPath(): string {
+function getCIPythonPath(): string {
     if (process.env.CI_PYTHON_PATH && fs.existsSync(process.env.CI_PYTHON_PATH)) {
         return process.env.CI_PYTHON_PATH;
     }

src/client/common/interpreterPathService.ts

@@ -15,11 +15,7 @@ import {
     WorkspaceConfiguration,
 } from 'vscode';
 import { IApplicationEnvironment, IWorkspaceService } from '../../client/common/application/types';
-import {
-    defaultInterpreterPathSetting,
-    getCIPythonPath,
-    InterpreterPathService,
-} from '../../client/common/interpreterPathService';
+import { defaultInterpreterPathSetting, InterpreterPathService } from '../../client/common/interpreterPathService';
 import { FileSystemPaths } from '../../client/common/platform/fs-paths';
 import { InterpreterConfigurationScope, IPersistentState, IPersistentStateFactory } from '../../client/common/types';
 import { createDeferred, sleep } from '../../client/common/utils/async';
@@ -451,8 +447,7 @@ suite('Interpreter Path Service', async () => {
             workspaceValue: undefined,
         });
         const settingValue = interpreterPathService.get(resource);
-
-        expect(settingValue).to.equal(getCIPythonPath());
+        expect(settingValue).to.equal('python');
     });
 
     test('If defaultInterpreterPathSetting is changed, an event is fired', async () => {

src/test/common/interpreterPathService.unit.test.ts

@@ -86,6 +86,7 @@ suite('pyenvs common utils - finding Python executables', () => {
                           <python3.8>
                           python3 -> sub2/sub2.2/python3
                           python3.7 -> sub2/sub2.1/sub2.1.1/python
+                          python2.7 -> does-not-exist
                 `);
             }
         });
@@ -105,6 +106,7 @@ suite('pyenvs common utils - finding Python executables', () => {
                               // These will match.
                               'python',
                               'python2',
+                              'python2.7',
                               'python3',
                               'python3.7',
                               'python3.8',
@@ -135,6 +137,7 @@ suite('pyenvs common utils - finding Python executables', () => {
                               // These will match.
                               'python',
                               'python2',
+                              'python2.7',
                               'python3',
                               'python3.7',
                               'python3.8',
@@ -164,6 +167,7 @@ suite('pyenvs common utils - finding Python executables', () => {
                               // These will match.
                               'python',
                               'python2',
+                              'python2.7',
                               'python3',
                               'python3.7',
                               'python3.8',