Merge pull request #1 from microsoft/master

merge upstream update

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

@@ -13,13 +13,16 @@
 	// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
 	"workspaceFolder": "/workspace",
 
-	// Add any extensions you want auto-installed here.
-	"extensions": [],
+	// Uncomment this like if you want to keep your containers running after VS Code shuts down.
+	// "shutdownAction": "none",
 
-	// Update the value of this line to 'none' if you want to keep your containers running after VS Code shuts down.
-	"shutdownAction": "stopCompose",
+	// 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": ["uname -a"]
-
+
+	// Add the IDs of any extensions you want installed in the array below.
+	"extensions": []
+
 }

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

@@ -5,12 +5,6 @@
 	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
 	"dockerFile": "Dockerfile",
 
-	// Use the optional 'appPort' property to publish any ports you want to access.
-	"appPort": [],
-
-	// Add any extensions you want auto-installed here.
-	"extensions": [],
-
 	// 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.
@@ -21,6 +15,16 @@
 		// "--security-opt", "seccomp=unconfined"
 	],
 
+	// 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": ["uname -a"]
+	// "postCreateCommand": "uname -a",
+
+	// Add the IDs of any extensions you want installed in the array below.
+	"extensions": []
+
 }

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

@@ -5,12 +5,6 @@
 	// Update the 'image' property with your Docker image name.
 	"image": "ubuntu:bionic",
 
-	// Use the optional 'appPort' property to publish any ports you want to access.
-	"appPort": [],
-
-	// Add any extensions you want auto-installed here.
-	"extensions": [],
-
 	// 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.
@@ -21,6 +15,15 @@
 		// "--security-opt", "seccomp=unconfined"
 	],
 
+	// 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": ["uname -a"]
+	// "postCreateCommand": "uname -a",
+
+	// Add the IDs of any extensions you want installed in the array below.
+	"extensions": []
 }

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

@@ -1,17 +1,24 @@
 {
 	"name": "Azure Ansible",
 	"dockerFile": "Dockerfile",
-	"extensions": [
-		"vscoss.vscode-ansible",
-		"redhat.vscode-yaml",
-		"ms-vscode.azurecli"
-	],
 	"runArgs": [
-		"-v",
-		"/var/run/docker.sock:/var/run/docker.sock"
+		// 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 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": "ansible --version"
+	// "postCreateCommand": "ansible --version",
+
+	"extensions": [
+		"vscoss.vscode-ansible",
+		"redhat.vscode-yaml",
+		"ms-vscode.azurecli"
+	]
 }

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

@@ -1,13 +1,21 @@
 {
 	"name": "Azure CLI",
 	"dockerFile": "Dockerfile",
-	"extensions": [
-		"ms-vscode.azurecli"
-	],
 
+	// 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 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"
+	// "postCreateCommand": "az --version",
+
+	"extensions": [
+		"ms-vscode.azurecli"
+	]
+
 }

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

@@ -2,11 +2,15 @@
 	"name": "Azure Functions & C# (.NET Core 2.1)",
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
+
+	// 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": "dotnet restore",
+
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"ms-vscode.csharp"
-	],
-
-	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "dotnet restore"
+	]
 }

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

@@ -2,11 +2,15 @@
 	"name": "Azure Functions & C# (.NET Core Latest)",
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
+
+	// 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": "dotnet restore",
+
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"ms-vscode.csharp"
-	],
-
-	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "dotnet restore"
+	]
 }

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

@@ -2,11 +2,15 @@
 	"name": "Azure Functions & Java 8",
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
+
+	// 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": "java -version",
+
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"vscjava.vscode-java-pack"
-	],
-
-	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "java -version"
+	]
 }

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

@@ -2,11 +2,15 @@
 	"name": "Azure Functions & Node.js 8",
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
+
+	// 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": "npm install",
+
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"dbaeumer.vscode-eslint"
-	],
-
-	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "npm install"
+	]
 }

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

@@ -2,11 +2,15 @@
 	"name": "Azure Functions & Node.js (latest LTS)",
 	"dockerFile": "Dockerfile",
 	"appPort": 7071,
+
+	// 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": "npm install",
+
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"dbaeumer.vscode-eslint"
-	],
-
-	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "npm install"
+	]
 }

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

@@ -12,10 +12,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1
 
-# Copy default endpoint specific user settings overrides into container to 
-# to specify Python path and that Docker should run as a workspace extension
-COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
-
 # Install git, required tools
 RUN apt-get install -y \
             git \

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

@@ -1,15 +1,26 @@
 { 
     "name": "Azure Machine Learning", 
     "dockerFile": "Dockerfile", 
-    "extensions": [ 
-        "ms-toolsai.vscode-ai",
-        "peterjausovec.vscode-docker"
-    ], 
-	"runArgs": ["-v","/var/run/docker.sock:/var/run/docker.sock"],
+	"runArgs": [
+        "-v","/var/run/docker.sock:/var/run/docker.sock"
+    ],
 
 	// Uncomment the next line if you want to publish any ports.
 	// "appPort": [],
 
 	// Uncomment the next line to run commands after the container is created.
-	// "postCreateCommand": "pip install -r requirements.txt"
+	// "postCreateCommand": "pip install -r requirements.txt",
+
+	"extensions": [ 
+        "ms-toolsai.vscode-ai",
+        "peterjausovec.vscode-docker"
+    ], 
+    "settings": {
+        "remote.extensionKind": {
+            "peterjausovec.vscode-docker": "workspace"
+        },
+        "python.pythonPath": "/opt/conda/bin/python",
+        "python.linting.pylintEnabled": true,
+        "python.linting.enabled": true
+    }
 } 

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

@@ -1,17 +1,25 @@
 {
 	"name": "Azure Terraform",
 	"dockerFile": "Dockerfile",
-	"extensions": [
-		"mauve.terraform",
-		"ms-azuretools.vscode-azureterraform",
-		"ms-vscode.azurecli",
-        "peterjausovec.vscode-docker"
+	"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"
 	],
-	"runArgs": ["-v","/var/run/docker.sock:/var/run/docker.sock"],
-
+
 	// 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": "terraform --version"
+	// "postCreateCommand": "terraform --version",
+
+	"extensions": [
+		"mauve.terraform",
+		"ms-azuretools.vscode-azureterraform",
+		"ms-vscode.azurecli",
+        "peterjausovec.vscode-docker"
+	]
 }

containers/bazel/.devcontainer/devcontainer.json

@@ -2,15 +2,19 @@
 	"name": "Bazel",
 	"dockerFile": "Dockerfile",
 
-	"extensions": ["devondcarew.bazel-code"],
+	// 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 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": "uname -a",
 
-	// 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" ]	
-
+	"extensions": [
+		"devondcarew.bazel-code"
+	]
 }

containers/cpp/.devcontainer/devcontainer.json

@@ -1,9 +1,6 @@
 {
 	"name": "C++",
 	"dockerFile": "Dockerfile",
-	"extensions": [
-		"ms-vscode.cpptools"
-	],
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt", "seccomp=unconfined"
@@ -12,6 +9,13 @@
 	// 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": "gcc -v"
+	// "postCreateCommand": "gcc -v",
+
+	"extensions": [
+		"ms-vscode.cpptools"
+	]
 }