.vscode/devContainer.json => .devcontainer/devcontainer.json

microsoft · Apr 3, 2019 · 0e2cce5 · 0e2cce5
1 parent 284c16d
commit 0e2cce5
Show file tree

Hide file tree

Showing 67 changed files with 12 additions and 101 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -100,17 +100,16 @@ If you want to create a new definition:
 
     ```
     📁 <language>-<optional: version>-<descriptor>
-       📁 .vscode
-          📄 devContainer.json
        📁 .devcontainer
+          📄 devcontainer.json
           📄 Dockerfile (optional)
           📄 docker-compose.yml (optional)
           📄 ignore
        📁 test-project (optional)
        📄 README.md
     ```
 
-    See the [VS Code Remote Development documentation](https://aka.ms/vscode-remote/docker) for information on the expected contents of `devContainer.json` and how it relates to other files listed above.
+    See the [VS Code Remote Development documentation](https://aka.ms/vscode-remote/docker) for information on the expected contents of `devcontainer.json` and how it relates to other files listed above.
 
     Note that any additional assets can be included as needed, but keep in mind that these will overlay on top of an existing project. Keeping these files in the `.devcontainer` should reduce the chances of something conflicting but note that any command that are run are relative to the root of the project, so you'll need to include `.devcontainer` in any path references.
 
@@ -136,7 +135,7 @@ Finally, after you get your container up and running, you can test it by adding
 
 While using a `Dockerfile` is a convienent way to get going with a new container definition, this method can slow down the process of creating the dev container since it requires the image be built by anyone using it.  If your definition is stable, we strongly reccomend building and publishing your image to [DockerHub](https://hub.docker.com) or [Azure Container Registry](https://azure.microsoft.com/en-us/services/container-registry/) instead. 
 
-Once you've published your container image, just update `devContainer.json` to reference the image instead of the `Dockerfile`. See `container-templates/image` for an example.
+Once you've published your container image, just update `devcontainer.json` to reference the image instead of the `Dockerfile`. See `container-templates/image` for an example.
 
 ## Contributing to Documentation
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Visual Studio Code Remote allows you to open any folder inside (or mounted into)
 
 **[See here to learn more about VS Code Remote](https://aka.ms/vscode-remote/containers)**.
 
-This repository contains a set of **dev container definitions** made up of files like `devContainer.json` to help get you up and running in a containerized environment. These definitions describe the needed container image, any runtime arguments for starting the container, and any VS Code extensions that should be installed into it.
+This repository contains a set of **dev container definitions** made up of files like `devcontainer.json` to help get you up and running in a containerized environment. These definitions describe the needed container image, any runtime arguments for starting the container, and any VS Code extensions that should be installed into it.
 
 ## Trying a definition
 
@@ -24,15 +24,15 @@ You can either:
 
 - Run **Remote: Create Container Configuration File...** command in VS Code and pick a definition. The appropriate files will then be added to your project.
 
-- Manually copy the contents of one of the `containers` sub-folders into your project. Copy the `.devcontainer` folder and `.vscode/devContainer.json` into your project and you should be ready to go!
+- Manually copy the contents of one of the `containers` sub-folders into your project. Copy the `.devcontainer` folder into your project and you should be ready to go!
 
 ### Can I just reuse an existing Docker configuration?
 
 Absolutely! If you want to use an existing Dockerfile as a starting point, run **Remote-Containers: Create Container Configuration File...** from the command pallette (Cmd/Ctrl+Shift+P). You'll be prompted to select a Dockerfile or you can opt to use a base image instead.
 
-#### About `.vscode/devContainer.json`
+#### About `.devcontainer/devcontainer.json`
 
-The intent of `devContainer.json` is conceptually similar to VS Code's `launch.json` for debugging, but designed to launch (or attach to) your development container instead. At its simplest, all you need to do is add a `.vscode/devContainer.json` file to your project and reference an image, `Dockerfile`, or `docker-compose.yml`.
+The intent of `devcontainer.json` is conceptually similar to VS Code's `launch.json` for debugging, but designed to launch (or attach to) your development container instead. At its simplest, all you need to do is add a `.devcontainer/devcontainer.json` file to your project and reference an image, `Dockerfile`, or `docker-compose.yml`.
 
 Since you are here, check out the [existing Dockerfile](containers/docker-existing-dockerfile) and [existing Docker Compose](containers/docker-existing-docker-compose) definitions for details, but here's the a quick tour of the basic properties. If you have a `Dockerfile`, set these properties:
 
@@ -43,7 +43,7 @@ Since you are here, check out the [existing Dockerfile](containers/docker-existi
 }
 ```
 
-For Docker Compose, you can [attach to an already running container](https://aka.ms/vscode-remote/containers/attach) or configure `.vscode/devContainer.json` with these properties:
+For Docker Compose, you can [attach to an already running container](https://aka.ms/vscode-remote/containers/attach) or configure `.devcontainer/devcontainer.json` with these properties:
 
 ```json
 {
@@ -60,7 +60,7 @@ The other definitions in the `containers` folder will provide examples of how to
 
 ## Adding a definition to an existing public or private repo
 
-You can easily share a customized dev container definition for your project by simply adding files like `.vscode/devContainer.json` to source control. By including these files in your repository, anyone that opens a local copy of your repo in VS Code will be automatically asked if they want reopen the folder in a container instead if the [Remote Development](https://aka.ms/vscode-remote/download/extension) extension installed.
+You can easily share a customized dev container definition for your project by simply adding files like `.devcontainer/devcontainer.json` to source control. By including these files in your repository, anyone that opens a local copy of your repo in VS Code will be automatically asked if they want reopen the folder in a container instead if the [Remote Development](https://aka.ms/vscode-remote/download/extension) extension installed.
 
 Beyond the advantages of having your team use a consistent environment and tool-chain, doing this can make it easier for new contributors or team members to get productive quickly. First-time contributors will require less guidance and are less likely to either submit issues or contribute code with issues that are related to environment setup.
 

diff --git a/...iners/azure-cli/.vscode/devContainer.json → ...azure-cli/.devcontainer/devcontainer.json b/...iners/azure-cli/.vscode/devContainer.json → ...azure-cli/.devcontainer/devcontainer.json
diff --git a/containers/azure-cli/.devcontainer/ignore b/containers/azure-cli/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...unctions-node-8/.vscode/devContainer.json → ...ns-node-8/.devcontainer/devcontainer.json b/...unctions-node-8/.vscode/devContainer.json → ...ns-node-8/.devcontainer/devcontainer.json
diff --git a/containers/azure-functions-node-8/.devcontainer/ignore b/containers/azure-functions-node-8/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...nsight-python-3/.vscode/devContainer.json → ...-python-3/.devcontainer/devcontainer.json b/...nsight-python-3/.vscode/devContainer.json → ...-python-3/.devcontainer/devcontainer.json
diff --git a/containers/azure-hdinsight-python-3/.devcontainer/ignore b/containers/azure-hdinsight-python-3/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/azure-machine-learning-python-3/.devcontainer/ignore b/containers/azure-machine-learning-python-3/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/azure-machine-learning-python-3/.vscode/devContainer.json b/containers/azure-machine-learning-python-3/.vscode/devContainer.json
diff --git a/...azure-terraform/.vscode/devContainer.json → ...terraform/.devcontainer/devcontainer.json b/...azure-terraform/.vscode/devContainer.json → ...terraform/.devcontainer/devcontainer.json
diff --git a/containers/azure-terraform/.devcontainer/ignore b/containers/azure-terraform/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/cpp/.vscode/devContainer.json → ...iners/cpp/.devcontainer/devcontainer.json b/containers/cpp/.vscode/devContainer.json → ...iners/cpp/.devcontainer/devcontainer.json
diff --git a/containers/cpp/.devcontainer/ignore b/containers/cpp/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ainers/dart-web/.vscode/devContainer.json → .../dart-web/.devcontainer/devcontainer.json b/...ainers/dart-web/.vscode/devContainer.json → .../dart-web/.devcontainer/devcontainer.json
diff --git a/containers/dart-web/.devcontainer/ignore b/containers/dart-web/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...-docker-compose/.vscode/devContainer.json → ...r-compose/.devcontainer/devcontainer.json b/...-docker-compose/.vscode/devContainer.json → ...r-compose/.devcontainer/devcontainer.json
diff --git a/containers/docker-existing-docker-compose/.devcontainer/ignore b/containers/docker-existing-docker-compose/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ting-dockerfile/.vscode/devContainer.json → ...ockerfile/.devcontainer/devcontainer.json b/...ting-dockerfile/.vscode/devContainer.json → ...ockerfile/.devcontainer/devcontainer.json
diff --git a/containers/docker-existing-dockerfile/.devcontainer/ignore b/containers/docker-existing-dockerfile/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...-docker-compose/.vscode/devContainer.json → ...r-compose/.devcontainer/devcontainer.json b/...-docker-compose/.vscode/devContainer.json → ...r-compose/.devcontainer/devcontainer.json
diff --git a/containers/docker-in-docker-compose/.devcontainer/ignore b/containers/docker-in-docker-compose/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ocker-in-docker/.vscode/devContainer.json → ...in-docker/.devcontainer/devcontainer.json b/...ocker-in-docker/.vscode/devContainer.json → ...in-docker/.devcontainer/devcontainer.json
diff --git a/containers/docker-in-docker/.devcontainer/ignore b/containers/docker-in-docker/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...core-2.2-fsharp/.vscode/devContainer.json → ....2-fsharp/.devcontainer/devcontainer.json b/...core-2.2-fsharp/.vscode/devContainer.json → ....2-fsharp/.devcontainer/devcontainer.json
diff --git a/containers/dotnetcore-2.2-fsharp/.devcontainer/ignore b/containers/dotnetcore-2.2-fsharp/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/.../dotnetcore-2.2/.vscode/devContainer.json → ...tcore-2.2/.devcontainer/devcontainer.json b/.../dotnetcore-2.2/.vscode/devContainer.json → ...tcore-2.2/.devcontainer/devcontainer.json
diff --git a/containers/dotnetcore-2.2/.devcontainer/ignore b/containers/dotnetcore-2.2/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/go/.vscode/devContainer.json → ...ainers/go/.devcontainer/devcontainer.json b/containers/go/.vscode/devContainer.json → ...ainers/go/.devcontainer/devcontainer.json
diff --git a/containers/go/.devcontainer/ignore b/containers/go/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...rs/java-8-maven/.vscode/devContainer.json → ...a-8-maven/.devcontainer/devcontainer.json b/...rs/java-8-maven/.vscode/devContainer.json → ...a-8-maven/.devcontainer/devcontainer.json
diff --git a/containers/java-8-maven/.devcontainer/ignore b/containers/java-8-maven/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...pt-node-8-mongo/.vscode/devContainer.json → ...e-8-mongo/.devcontainer/devcontainer.json b/...pt-node-8-mongo/.vscode/devContainer.json → ...e-8-mongo/.devcontainer/devcontainer.json
diff --git a/containers/javascript-node-8-mongo/.devcontainer/ignore b/containers/javascript-node-8-mongo/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...vascript-node-8/.vscode/devContainer.json → ...pt-node-8/.devcontainer/devcontainer.json b/...vascript-node-8/.vscode/devContainer.json → ...pt-node-8/.devcontainer/devcontainer.json
diff --git a/containers/javascript-node-8/.devcontainer/ignore b/containers/javascript-node-8/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...kubernetes-helm/.vscode/devContainer.json → ...etes-helm/.devcontainer/devcontainer.json b/...kubernetes-helm/.vscode/devContainer.json → ...etes-helm/.devcontainer/devcontainer.json
diff --git a/containers/kubernetes-helm/.devcontainer/ignore b/containers/kubernetes-helm/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/latex/.devcontainer/ignore b/containers/latex/.devcontainer/ignore
diff --git a/containers/latex/.vscode/devContainer.json b/containers/latex/.vscode/devContainer.json
diff --git a/containers/latex/README.md b/containers/latex/README.md
diff --git a/...ainers/markdown/.vscode/devContainer.json → .../markdown/.devcontainer/devcontainer.json b/...ainers/markdown/.vscode/devContainer.json → .../markdown/.devcontainer/devcontainer.json
diff --git a/containers/markdown/.devcontainer/ignore b/containers/markdown/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/php-7/.vscode/devContainer.json → ...ers/php-7/.devcontainer/devcontainer.json b/containers/php-7/.vscode/devContainer.json → ...ers/php-7/.devcontainer/devcontainer.json
diff --git a/containers/php-7/.devcontainer/ignore b/containers/php-7/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ainers/plantuml/.vscode/devContainer.json → .../plantuml/.devcontainer/devcontainer.json b/...ainers/plantuml/.vscode/devContainer.json → .../plantuml/.devcontainer/devcontainer.json
diff --git a/containers/plantuml/.devcontainer/ignore b/containers/plantuml/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ners/powershell/.vscode/devContainer.json → ...owershell/.devcontainer/devcontainer.json b/...ners/powershell/.vscode/devContainer.json → ...owershell/.devcontainer/devcontainer.json
diff --git a/containers/powershell/.devcontainer/ignore b/containers/powershell/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ainers/python-2/.vscode/devContainer.json → .../python-2/.devcontainer/devcontainer.json b/...ainers/python-2/.vscode/devContainer.json → .../python-2/.devcontainer/devcontainer.json
diff --git a/containers/python-2/.devcontainer/ignore b/containers/python-2/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...python-3-django/.vscode/devContainer.json → ...-3-django/.devcontainer/devcontainer.json b/...python-3-django/.vscode/devContainer.json → ...-3-django/.devcontainer/devcontainer.json
diff --git a/containers/python-3-django/.devcontainer/ignore b/containers/python-3-django/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...n-3-flask-redis/.vscode/devContainer.json → ...ask-redis/.devcontainer/devcontainer.json b/...n-3-flask-redis/.vscode/devContainer.json → ...ask-redis/.devcontainer/devcontainer.json
diff --git a/containers/python-3-flask-redis/.devcontainer/ignore b/containers/python-3-flask-redis/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...jupyter-pyspark/.vscode/devContainer.json → ...r-pyspark/.devcontainer/devcontainer.json b/...jupyter-pyspark/.vscode/devContainer.json → ...r-pyspark/.devcontainer/devcontainer.json
diff --git a/containers/python-3-jupyter-pyspark/.devcontainer/ignore b/containers/python-3-jupyter-pyspark/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/...ainers/python-3/.vscode/devContainer.json → .../python-3/.devcontainer/devcontainer.json b/...ainers/python-3/.vscode/devContainer.json → .../python-3/.devcontainer/devcontainer.json
diff --git a/containers/python-3/.devcontainer/ignore b/containers/python-3/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/ruby-2/.vscode/devContainer.json → ...rs/ruby-2/.devcontainer/devcontainer.json b/containers/ruby-2/.vscode/devContainer.json → ...rs/ruby-2/.devcontainer/devcontainer.json
diff --git a/containers/ruby-2/.devcontainer/ignore b/containers/ruby-2/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/rust/.vscode/devContainer.json → ...ners/rust/.devcontainer/devcontainer.json b/containers/rust/.vscode/devContainer.json → ...ners/rust/.devcontainer/devcontainer.json
diff --git a/containers/rust/.devcontainer/ignore b/containers/rust/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json
diff --git a/containers/swift-4/.vscode/devContainer.json → ...s/swift-4/.devcontainer/devcontainer.json b/containers/swift-4/.vscode/devContainer.json → ...s/swift-4/.devcontainer/devcontainer.json
diff --git a/containers/swift-4/.devcontainer/ignore b/containers/swift-4/.devcontainer/ignore
@@ -1,6 +1,3 @@
-../README.md
-../test-project
-../.vscode/launch.json
-../.vscode/launch.test.json
-../.vscode/settings.json
-../.vscode/tasks.json
+README.md
+test-project
+.vscode
diff --git a/...pescript-node-8/.vscode/devContainer.json → ...pt-node-8/.devcontainer/devcontainer.json b/...pescript-node-8/.vscode/devContainer.json → ...pt-node-8/.devcontainer/devcontainer.json
diff --git a/containers/typescript-node-8/.devcontainer/ignore b/containers/typescript-node-8/.devcontainer/ignore
@@ -1,5 +1,3 @@
 README.md
 test-project
 .vscode
-!.vscode/devContainer.json
-!.vscode/devcontainer.json