Merge remote-tracking branch 'origin/master'

Author: Shikanime

.editorconfig

@@ -0,0 +1,10 @@
+[*.json]
+indent_style = tab
+
+[Dockerfile]
+indent_style = spaces
+indent_size = 4
+
+[*.{yml,yaml}]
+indent_style = spaces
+indent_size = 2

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

CONTRIBUTING.md

@@ -4,11 +4,26 @@ This document outlines a number of ways you can get involved.
 
 ## Contributing Dev Container Definitions
 
-Have a container set up you're proud of and would like to share? Want to see some changes made to an existing definition? We love contributions!  Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
+This repository contains a set of **dev container definitions** to help get you up and running with a containerized environment. The definitions describe the appropriate container image, runtime arguments for starting the container, and VS Code extensions that should be installed. They are intended to be dropped into an existing project or folder rather than acting as sample projects. (See the [vscode-remote-try-*](https://github.com/search?q=org%3Amicrosoft+vscode-remote-try-&type=Repositories) repositories if you are looking for sample projects.)  
+
+Have a container set up you're proud of and would like to share? Want to see some changes made to an existing definition? We love contributions! Read on to learn how.
+
+### Anatomy of a Dev Container Definition
+
+The contents of the folders in the `containers` directory ultimately populate the available definitions list shown in the **Remote-Containers: Create Container Configuration File...** command. To make this work, each folder consists of up to three things:
+
+1. **The container definition itself** - These are the files and folders that will be added to a user's existing project / folder if they select the definition. Typically these files are stored in a `.devcontainer` folder.
+2. **Test assets** - While you are creating your definition, you may need to use a test project to make sure it works as expected. Contributing these files back will also help others that want to contribute to your definition in the future. These files are typically located in a `test-project` folder.
+3. **A `.npmignore` file** - This tells VS Code which files in the folder should be ignored when a user selects it for their project / folder. The file typically lists test assets or folders.
+
+### Creating a new definition
+
+Most contributions require you to agree to a Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us the rights to use your contribution. For details, visit https://cla.microsoft.com.
 
 When you submit a pull request, a CLA-bot will automatically determine whether you need to provide a CLA and decorate the PR appropriately (e.g., label, comment). Simply follow the instructions provided by the bot. You will only need to do this once across all repos using our CLA.
 
-If you want to create a new definition:
+
+To create a new definition:
 
 1. Fork and clone this repository
 
@@ -37,29 +52,36 @@ If you want to create a new definition:
 
     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` folder 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.
 
-    VS Code respects [`.npmignore`](https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package) as a way to keep certain content out of projects when your definition is used. Add anything you don't want copied across into this file in [glob](https://facelessuser.github.io/wcmatch/glob/) form.
-
     Finally, create a `README.md` in the folder with a brief description of the purpose of the container definition and any manual steps required to use it.
 
-4. Commit your changes and submit a PR - we'll take a look at it, provide any needed feedback, and then merge it in. We appreciate any and all feedback!
+4. Update [`.npmignore`](https://docs.npmjs.com/misc/developers#keeping-files-out-of-your-package) if you've added new folders that should be excluded if used. Add anything you don't want copied in to a user's existing project / folder into this file in [glob](https://facelessuser.github.io/wcmatch/glob/) form.
 
 ### Developing and testing a definition
 
 VS Code Remote provides a straight forward development loop for creating and editing container definitions. Just follow these steps to get started:
 
 1. Create a definition folder and open it in VS Code
 2. Edit the contents of the definition
-3. Run the **Remote: Reopen Folder in Container** command
-4. If this fails, click "Open folder locally" in the dialog that appears and go to step 2
-6. If it opens successfully but you don't like the contents, edit the contents from within the container and run the **Remote: Rebuild Container** command to make changes.
+3. Try it with `kbstyle(F1)` > **Remote-Containers: Reopen Folder in Container**.
+4. On failure:
+   1. `kbstyle(F1)` > **Remote-Containers: Reopen Folder Locally**, which will open a new local window.
+   2. In this local window: Edit the contents of the `.devcontainer` folder as required.
+   3. Try it again: Go back to the container window, `kbstyle(F1)` > **Developer: Reload Window**.
+   4. Repeat as needed.
+5. If the build was successful, but you want to make more changes:
+      1. Edit the contents of the `.devcontainer` folder as required when connected to the container.
+      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=PeterJausovec.vscode-docker) locally (when not in a container) to make this easy. While you can use Docker from inside a container by forwarding the Docker unix socket and installing the CLI in the container (see [Docker-in-Docker](containers/docker-in-docker)), you'll likely be removing the container you are actually using so this approach will not work well in this case.
+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.
 
-Finally, after you get your container up and running, you can test it by adding test assets into the definition folder and add them to the `.devcontainer/ignore` 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 `ignore` files. 
+Finally, commit your changes and submit a PR - we'll take a look at it, provide any needed feedback, and then merge it in. We appreciate any and all feedback!
 
 ### Speeding up container provisioning
 
-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. 
+While using a `Dockerfile` is a convenient 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 recommend 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.
 

README.md

@@ -9,9 +9,9 @@
 </td>
 </tr></table>
 
-A **development container** is a running [Docker](https://www.docker.com) container with a well-defined tool/runtime stack and its prerequisites. The Remote - Containers extension in the [Remote Development](https://aka.ms/vscode-remote/download/extension) extension pack allows you to open any folder inside (or mounted into) a dev container and take advantage of VS Code's full development feature set.
+A **development container** is a running [Docker](https://www.docker.com) container with a well-defined tool/runtime stack and its prerequisites. The Remote - Containers extension in the [Remote Development](https://aka.ms/vscode-remote/download/extension) extension pack allows you to open any folder mounted into or inside a dev container and take advantage of VS Code's full development feature set.
 
-This repository contains a set of **dev container definitions** to help get you up and running with a containerized environment. The definitions describe the appropriate container image, runtime arguments for starting the container, and VS Code extensions that should be installed. They can also be used as examples for adapting your own configuration to different situations.
+This repository contains a set of **dev container definitions** to help get you up and running with a containerized environment. The definitions describe the appropriate container image, runtime arguments for starting the container, and VS Code extensions that should be installed. They are intended to be dropped into an existing project or folder rather than acting as sample projects. (See the [vscode-remote-try-*](https://github.com/search?q=org%3Amicrosoft+vscode-remote-try-&type=Repositories) repositories if you are looking for sample projects.)
 
 ## Using a definition
 
@@ -35,7 +35,7 @@ Your team now has a consistent environment and tool-chain and new contributors o
 
 ## Testing a definition
 
-If you want to test a definition before choosing one:
+Some dev container definitions include test assets. To test a definition:
 
 1. If this is your first time creating a dev container, follow the [getting started steps](https://aka.ms/vscode-remote/containers/getting-started) to configure your machine.
 2. Browse the contents of the  `containers` folder in this repository and pick one. Review the `README` to see if there are any manual setup steps before continuing.

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

@@ -1,11 +1,25 @@
 {
-    // "See https://aka.ms/vscode-remote/devcontainer.json for format details."
-    "name": "Dev Container Definition Template - Docker Compose",
-    "dockerComposeFile": "docker-compose.yml",
-    "service": "your-service-name-here",
-    "workspaceFolder": "/workspace",
-    "shutdownAction": "stopCompose",
-    "extensions": [
-        "mutantdino.resourcemonitor"
-    ]
+	// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+	"name": "Dev Container Definition Template - Docker Compose",
+
+	// Update the 'dockerComposeFile' list if you have more compose files or use different names.
+	"dockerComposeFile": "docker-compose.yml",
+
+	// The 'service' property is the name of the service for the container that VS Code should
+	// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+	"service": "your-service-name-here",
+
+	// The optional 'workspaceFolder' property is the path VS Code should open by default when
+	// connected. This is typically a volume mount in .devcontainer/docker-compose.yml
+	"workspaceFolder": "/workspace",
+
+	// Add any extensions you want auto-installed here.
+	"extensions": [],
+
+	// 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 to run commands after the container is created.
+	// "postCreateCommand": ["uname -a"]
+	
 }

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

@@ -9,11 +9,11 @@ services:
     # Using a Dockerfile is optional, but included for completeness.
     build: 
       context: .
-      dockerfile: .devcontainer/Dockerfile  
+      dockerfile: Dockerfile  
 
-    # Application port(s) to expose
-    ports:
-     - "3000:3000"  
+    # Uncomment to expose one or more ports
+    # ports:
+    #  - "3000:3000"  
 
     volumes:
       # This is where VS Code should expect to find your project's source code
@@ -23,6 +23,15 @@ services:
       # This lets you avoid setting up Git again in the container
       - ~/.gitconfig:/root/.gitconfig
 
-    # Overrides default command so things don't shut down after the process ends - useful for debugging
+      # Uncomment the next line if you plan to install the Docker CLI. See the docker-in-docker-compose definition for details.
+      # - /var/run/docker.sock:/var/run/docker.sock 
+
+    # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
+    # cap_add:
+    #   - SYS_PTRACE
+    # security_opt:
+    #   - seccomp:unconfined
+
+    # Overrides default command so things don't shut down after the process ends.
     command: sleep infinity  
 

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

@@ -1,10 +1,26 @@
 {
-    // "See https://aka.ms/vscode-remote/devcontainer.json for format details."
-    "name": "Dev Container Definition Template - Dockerfile",   
-    "dockerFile": "Dockerfile",
-    "appPort": 3000,
-    "extensions": [
-        "mutantdino.resourcemonitor"
-    ],
-    "runArgs": []
+	// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+	"name": "Dev Container Definition Template - Dockerfile",
+
+	// 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.
+		// "-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 to run commands after the container is created.
+	// "postCreateCommand": ["uname -a"]
 }

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

@@ -1,10 +1,26 @@
 {
-    // "See https://aka.ms/vscode-remote/devcontainer.json for format details."
-    "name": "Dev Container Definition Template - Container Image",
-    "image": "ubuntu:bionic",
-    "appPort": 3000,
-    "extensions": [
-        "mutantdino.resourcemonitor"
-    ],
-    "runArgs": []
+	// See https://aka.ms/vscode-remote/devcontainer.json for format details.
+	"name": "Dev Container Definition Template - Container Image",
+
+	// 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.
+		// "-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 to run commands after the container is created.
+	// "postCreateCommand": ["uname -a"]
 }

containers/azure-ansible/.devcontainer/Dockerfile

@@ -0,0 +1,55 @@
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+
+# Pick any base image, but if you select node, skip installing node. 😊
+FROM debian:9
+
+# Configure apt
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update \
+        && apt-get -y install --no-install-recommends apt-utils 2>&1
+
+# Install git, required tools
+RUN apt-get install -y \
+        git \
+        curl \
+        procps \
+        unzip \
+        apt-transport-https \
+        ca-certificates \
+        gnupg-agent \
+        software-properties-common \
+        lsb-release 2>&1
+
+# [Optional] Install Node.js for Azure Cloud Shell support 
+# Change the "lts/*" in the two lines below to pick a different version
+RUN curl -so- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | bash 2>&1 \
+        && /bin/bash -c "source $HOME/.nvm/nvm.sh \
+        && nvm install lts/* \
+        && nvm alias default lts/*" 2>&1
+
+# [Optional] For local testing instead of cloud shell
+# Install Docker CE CLI. 
+RUN curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \
+        && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
+        && apt-get update \
+        && apt-get install -y docker-ce-cli
+
+# [Optional] For local testing instead of cloud shell
+# Install the Azure CLI
+RUN echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
+        && curl -sL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
+        && apt-get update \
+        && apt-get install -y azure-cli 
+
+# Install Ansible
+RUN apt-get install -y libssl-dev libffi-dev python-dev python-pip \
+        && pip install ansible[azure]
+
+# Clean up
+RUN apt-get autoremove -y \
+        && apt-get clean -y \
+        && rm -rf /var/lib/apt/lists/*
+ENV DEBIAN_FRONTEND=dialog

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

@@ -0,0 +1,17 @@
+{
+	"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 want to publish any ports.
+	// "appPort": [],
+	// Uncomment the next line to run commands after the container is created.
+	// "postCreateCommand": "ansible --version"
+}