Merge branch 'master' of https://github.com/Microsoft/vscode-dev-containers

Author: Chuxel

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

@@ -15,6 +15,7 @@
 	// 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": { 
+		// If you are using an Alpine-based image, change this to /bin/ash
 		"terminal.integrated.shell.linux": "/bin/bash"
 	},
 
@@ -29,4 +30,4 @@
 
 	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": []
-}
+}

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

@@ -21,6 +21,7 @@
 	// 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": { 
+		// If you are using an Alpine-based image, change this to /bin/ash
 		"terminal.integrated.shell.linux": "/bin/bash"
 	},
 
@@ -32,4 +33,4 @@
 
 	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": []
-	}
+	}

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

@@ -18,6 +18,7 @@
 	// 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": { 
+		// If you are using an Alpine-based image, change this to /bin/ash
 		"terminal.integrated.shell.linux": "/bin/bash"
 	},
 
@@ -29,4 +30,4 @@
 
 	// Add the IDs of extensions you want installed when the container is created in the array below.
 	"extensions": []
-}
+}

containers/sfdx-project/.devcontainer/devcontainer.json

@@ -6,6 +6,9 @@
       "redhat.vscode-xml",
       "dbaeumer.vscode-eslint",
       "esbenp.prettier-vscode"
-    ]
+    ],
+    "settings": {
+      "salesforcedx-vscode-apex.java.home": "/usr/lib/jvm/java-11-openjdk-amd64"
+    }
   }
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "vscode-dev-containers",
-	"version": "0.28.0",
+	"version": "0.29.0",
 	"description": "VS Code Dev Containers: Definitions and Templates",
 	"repository": {
 		"type": "git",

repository-containers/github.com/barryclark/jekyll-now/.devcontainer/Dockerfile

@@ -14,4 +14,4 @@ RUN apt-get autoremove -y \
     && rm -rf /var/lib/apt/lists/*
 
 # Install jekyll
-RUN gem install git iproute2hub-pages
+RUN gem install github-pages