Added comment on mounting .ssh folder, fixed Docker extn ID

CONTRIBUTING.md

@@ -91,7 +91,7 @@ VS Code Remote provides a straight forward development loop for creating and edi
       2. `kbstyle(F1)` > **Remote-Containers: Rebuild Container**.
       3. On failure: Follow the same workflow above.
 
-Note that if you make major changes, Docker may occasionally not pick up your edits. If this happens, you can delete the existing container and image, open the folder locally, and go to step 2 above. Install the [Docker extension](https://marketplace.visualstudio.com/items?itemName=PeterJausovec.vscode-docker) locally (when not in a container) to make this easy
+Note that if you make major changes, Docker may occasionally not pick up your edits. If this happens, you can delete the existing container and image, open the folder locally, and go to step 2 above. Install the [Docker extension](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-docker) locally (when not in a container) to make this easy
 
 After you get your container up and running, you can test it by adding test assets / projects into the definition folder and then adding their locations to the `.npmignore` file in [glob](https://facelessuser.github.io/wcmatch/glob/) form relative to the root of the folder. By convention, most definitions place test assets in a `test-project` folder and this path is referenced in the template `.npmignore` files.
 

container-templates/docker-compose/.devcontainer/docker-compose.yml

@@ -20,12 +20,12 @@ services:
       # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
       - ..:/workspace  
 
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
-
-      # Uncomment the next line if you plan to install the Docker CLI. See the docker-in-docker-compose definition for details.
+      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker-compose for details.
       # - /var/run/docker.sock:/var/run/docker.sock 
 
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
+
     # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
     # cap_add:
     #   - SYS_PTRACE

container-templates/dockerfile/.devcontainer/devcontainer.json

@@ -7,12 +7,14 @@
 
 	// The optional 'runArgs' property can be used to specify additional runtime arguments.
 	"runArgs": [
-		//  Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
+		// Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker for details.
 		// "-v","/var/run/docker.sock:/var/run/docker.sock",
 
-		// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust
-		// "--cap-add=SYS_PTRACE",
-		// "--security-opt", "seccomp=unconfined"
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",	
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
 	],
 
 	// Uncomment the next line if you want to publish any ports.

container-templates/image/.devcontainer/devcontainer.json

@@ -7,12 +7,8 @@
 
 	// The optional 'runArgs' property can be used to specify additional runtime arguments.
 	"runArgs": [
-		//  Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
-		// "-v","/var/run/docker.sock:/var/run/docker.sock",
-
-		// Uncomment the next two lines if you will use a ptrace-based debugger like C++, Go, and Rust.
-		// "--cap-add=SYS_PTRACE",
-		// "--security-opt", "seccomp=unconfined"
+		// Uncomment the line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
 	],
 
 	// Uncomment the next line if you want to publish any ports.

containers/azure-ansible/.devcontainer/devcontainer.json

@@ -4,6 +4,10 @@
 	"runArgs": [
 		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
 		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
 		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
@@ -19,6 +23,12 @@
 	"extensions": [
 		"vscoss.vscode-ansible",
 		"redhat.vscode-yaml",
-		"ms-vscode.azurecli"
-	]
+		"ms-vscode.azurecli",
+		"ms-azuretools.vscode-docker"
+	],
+	"settings": {
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+		}
+	}
 }

containers/azure-blockchain/.devcontainer/devcontainer.json

@@ -1,14 +1,19 @@
 {
 	"name": "Azure Blockchain",
 	"dockerFile": "Dockerfile",
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
+
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "az --version",
+
 	"extensions": [
 		"ms-vscode.azurecli",
 		"azblockchain.azure-blockchain"

containers/azure-cli/.devcontainer/devcontainer.json

@@ -2,8 +2,13 @@
 	"name": "Azure CLI",
 	"dockerFile": "Dockerfile",
 
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],

containers/azure-functions-dotnetcore-2.1/.devcontainer/devcontainer.json

@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 

containers/azure-functions-dotnetcore-latest/.devcontainer/devcontainer.json

@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 

containers/azure-functions-java-8/.devcontainer/devcontainer.json

@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 

containers/azure-functions-node-8/.devcontainer/devcontainer.json

@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 

containers/azure-functions-node-lts/.devcontainer/devcontainer.json

@@ -3,6 +3,9 @@
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to add in default container specific settings.json values
 	// "settings":  { "workbench.colorTheme": "Quiet Light" },
 

containers/azure-functions-python-3/.devcontainer/devcontainer.json

@@ -3,20 +3,24 @@
 	"name": "Azure Functions & Python 3",
 	"dockerFile": "Dockerfile",
 	"appPort": [ 7071 ],
-	"runArgs": ["-v","/var/run/docker.sock:/var/run/docker.sock"],
+	"runArgs": [
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
 
-	// Uncomment the next line if you want to add in default container specific settings.json values
-	"settings":  {
-		"remote.extensionKind": {
-			"ms-azuretools.vscode-docker": "workspace"
-		}
-	},
+		"-v","/var/run/docker.sock:/var/run/docker.sock"
+	],
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "npm install",
 
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
+		"ms-azuretools.vscode-docker",
 		"ms-python.python"
-	]
+	],
+	"settings":  {
+		"remote.extensionKind": {
+			"ms-azuretools.vscode-docker": "workspace"
+		}
+	}
 }

containers/azure-machine-learning-python-3/.devcontainer/devcontainer.json

@@ -2,8 +2,11 @@
     "name": "Azure Machine Learning", 
     "dockerFile": "Dockerfile", 
 	"runArgs": [
-        "-v","/var/run/docker.sock:/var/run/docker.sock"
-    ],
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"-v", "/var/run/docker.sock:/var/run/docker.sock"
+	],
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
@@ -13,11 +16,11 @@
 
 	"extensions": [ 
         "ms-toolsai.vscode-ai",
-        "peterjausovec.vscode-docker"
+        "ms-azuretools.vscode-docker"
     ], 
     "settings": {
         "remote.extensionKind": {
-            "peterjausovec.vscode-docker": "workspace"
+            "ms-azuretools.vscode-docker": "workspace"
         },
         "python.pythonPath": "/opt/conda/bin/python",
         "python.linting.pylintEnabled": true,

containers/azure-terraform/.devcontainer/devcontainer.json

@@ -4,7 +4,11 @@
 	"runArgs": [
 		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
 		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
-		"-v","/var/run/docker.sock:/var/run/docker.sock"
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
 	// Uncomment the next line if you want to publish any ports.
@@ -20,6 +24,11 @@
 		"mauve.terraform",
 		"ms-azuretools.vscode-azureterraform",
 		"ms-vscode.azurecli",
-        "peterjausovec.vscode-docker"
-	]
+        "ms-azuretools.vscode-docker"
+	],
+	"settings": {
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+		}
+	}
 }

containers/bazel/.devcontainer/devcontainer.json

@@ -1,9 +1,13 @@
 {
 	"name": "Bazel",
 	"dockerFile": "Dockerfile",
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
 
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ]	
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],

containers/cpp/.devcontainer/devcontainer.json

@@ -1,10 +1,12 @@
 {
 	"name": "C++",
 	"dockerFile": "Dockerfile",
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt", "seccomp=unconfined"
-	],
+	"runArgs": [	
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh",
+
+		"--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
+	],	
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],

containers/dart/.devcontainer/devcontainer.json

@@ -2,6 +2,9 @@
 	"name": "Dart",
 	"dockerFile": "Dockerfile",
 
+	// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+	// "runArgs": [ "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh" ],
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 

containers/debian-9-git/.devcontainer/devcontainer.json

@@ -2,9 +2,14 @@
 	"name": "Debian 9 & Git",
 	"dockerFile": "Dockerfile",
 
-	// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
-	// "runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ],
+	"runArgs": [ 
+		// Uncomment the next line if you will use a ptrace-based debugger like C++, Go, and Rust.
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined" ,
 
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
+	],	
+
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 

containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml

@@ -20,12 +20,12 @@ services:
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
 
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
-
-      # Uncomment the next line if you plan to install the Docker CLI. See the docker-in-docker-compose definition for details.
+      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker-compose for details.
       # - /var/run/docker.sock:/var/run/docker.sock 
 
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
+
     # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
     # cap_add:
     #   - SYS_PTRACE

containers/docker-existing-dockerfile/.devcontainer/devcontainer.json

@@ -10,11 +10,14 @@
 
 	// The optional 'runArgs' property can be used to specify additional runtime arguments.
 	"runArgs": [
-		//  Uncomment the next line if you want to use Docker from the container. See the docker-in-docker definition for details.
+		// Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-in-docker for details.
 		// "-v","/var/run/docker.sock:/var/run/docker.sock",
 
 		// Uncomment the next line if you will be using a ptrace-based debugger like C++, Go, and Rust.
-		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"
+		// "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined",
+
+		// Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+		// "-v", ${env:HOME}${env:USERPROFILE}/.ssh:/root/.ssh"
 	],
 
 	// Uncomment the next line if you want to publish any ports.

containers/docker-in-docker-compose/.devcontainer/devcontainer.json

@@ -11,11 +11,11 @@
 	// "postCreateCommand": "docker --version"
 
 	"extensions": [
-		"peterjausovec.vscode-docker"
+		"ms-azuretools.vscode-docker"
 	],
 	"settings": {
 		"remote.extensionKind": {
-			"peterjausovec.vscode-docker": "workspace"
+			"ms-azuretools.vscode-docker": "workspace"
 		}
 	}
 }

containers/docker-in-docker-compose/.devcontainer/docker-compose.yml

@@ -14,12 +14,12 @@ services:
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
 
-      # This lets you avoid setting up Git again in the container
-      - ~/.gitconfig:/root/.gitconfig
-
       # Forwards the local Docker socket to the container.
       - /var/run/docker.sock:/var/run/docker.sock 
 
+      # Uncomment the next line to share your ssh keys with the container (e.g. for Git)
+      # - ~/.ssh:/root/.ssh
+
     # Uncomment the next four lines if you will use a ptrace-based debuggers like C++, Go, and Rust.
     # cap_add:
     #  - SYS_PTRACE