Add setting to workaround VSCR #1203, add runServices comment to Dock…

…er Compose defs

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

@@ -12,16 +12,21 @@
 	// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
 	"workspaceFolder": "/workspace",
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Uncomment the next line if you want start specific services in your Docker Compose config.
+	// "runServices": [],
+
 	// Uncomment this like if you want to keep your containers running after VS Code shuts down.
 	// "shutdownAction": "none",
 
-	// 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.
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": []
-
 }

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

@@ -18,16 +18,18 @@
 		// "-u", "vscode"
 	],
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
 	// 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",
 
-	// Add the IDs of any extensions you want installed in the array below.
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": []
-
-}
+	}

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

@@ -15,15 +15,18 @@
 		// "-u", "vscode"
 	],
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
 	// 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 - like installing git
 	// "postCreateCommand": "apt-get update && apt-get install -y git",
 
-	// Add the IDs of any extensions you want installed in the array below.
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": []
 }

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

@@ -13,24 +13,26 @@
 		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash",
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+		}
+	},
+
 	// 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",
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"vscoss.vscode-ansible",
 		"redhat.vscode-yaml",
 		"ms-vscode.azurecli",
 		"ms-azuretools.vscode-docker"
-	],
-	"settings": {
-        "remote.extensionKind": {
-            "ms-azuretools.vscode-docker": "workspace"
-		}
-	}
+	]
 }

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

@@ -2,12 +2,15 @@
 	"name": "Azure Blockchain",
 	"dockerFile": "Dockerfile",
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
 	// 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",
 
@@ -16,6 +19,7 @@
 	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
 	// "runArgs": [ "-u", "vscode" ],
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-vscode.azurecli",
 		"azblockchain.azure-blockchain"

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

@@ -13,15 +13,19 @@
 		// "-u", "vscode"
 	],
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
 	// 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",
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-vscode.azurecli"
 	]

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

@@ -3,8 +3,11 @@
 	"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" },
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "dotnet restore",
@@ -14,6 +17,7 @@
 	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
 	// "runArgs": [ "-u", "vscode" ],
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"ms-vscode.csharp"

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

@@ -3,8 +3,11 @@
 	"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" },
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "dotnet restore",
@@ -14,6 +17,7 @@
 	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
 	// "runArgs": [ "-u", "vscode" ],
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"ms-vscode.csharp"

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

@@ -3,8 +3,12 @@
 	"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" },
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"java.home": "/docker-java-home"
+	},
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "java -version",
@@ -14,11 +18,9 @@
 	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
 	// "runArgs": [ "-u", "vscode" ],
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"vscjava.vscode-java-pack"
-	],
-	"settings": {
-		"java.home": "/docker-java-home"
-	}
+	]
 }

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

@@ -3,8 +3,11 @@
 	"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" },
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "npm install",
@@ -14,6 +17,7 @@
 	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
 	// "runArgs": [ "-u", "node" ],
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"dbaeumer.vscode-eslint"

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

@@ -3,8 +3,11 @@
 	"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" },
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
 
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "npm install",
@@ -14,6 +17,7 @@
 	// and USER_GID in .devcontainer/Dockerfile to match your user if not 1000.
 	// "runArgs": [ "-u", "node" ],
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"ms-azuretools.vscode-azurefunctions",
 		"dbaeumer.vscode-eslint"

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

@@ -11,17 +11,22 @@
 		"-v","/var/run/docker.sock:/var/run/docker.sock"
 	],
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings":  {
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"remote.extensionKind": {
+			"ms-azuretools.vscode-docker": "workspace"
+		}
+	},
+
 	// Uncomment the next line to run commands after the container is created.
 	// "postCreateCommand": "npm install",
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"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

@@ -10,22 +10,28 @@
 		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
+
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": {
+		"terminal.integrated.shell.linux": "/bin/bash",
+		"remote.extensionKind": {
+			"ms-azuretools.vscode-docker": "workspace"
+		},
+		"python.pythonPath": "/opt/conda/bin/python",
+		"python.linting.pylintEnabled": true,
+		"python.linting.enabled": true
+	},
+
 	// 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",
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [ 
 		"ms-toolsai.vscode-ai",
 		"ms-azuretools.vscode-docker"
-	], 
-	"settings": {
-		"remote.extensionKind": {
-			"ms-azuretools.vscode-docker": "workspace"
-		},
-		"python.pythonPath": "/opt/conda/bin/python",
-		"python.linting.pylintEnabled": true,
-		"python.linting.enabled": true
-	}
+	]
 } 

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

@@ -13,24 +13,26 @@
 		"-v", "/var/run/docker.sock:/var/run/docker.sock"
 	],
 
+	// Use 'settings' to set *default* container specific settings.json values on container create. 
+	// You can edit these settings after create using File > Preferences > Settings > Remote.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash",
+        "remote.extensionKind": {
+            "ms-azuretools.vscode-docker": "workspace"
+		}
+	},
+
 	// 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",
 
+	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": [
 		"mauve.terraform",
 		"ms-azuretools.vscode-azureterraform",
 		"ms-vscode.azurecli",
         "ms-azuretools.vscode-docker"
-	],
-	"settings": {
-        "remote.extensionKind": {
-            "ms-azuretools.vscode-docker": "workspace"
-		}
-	}
+	]
 }