Merge branch 'clantz/docker-in-docker-updates' of https://github.com/Microsoft/vscode-dev-containers

Author: Chuxel

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

@@ -6,15 +6,23 @@
 version: '3'
 services:
   your-service-name-here:
+    # Using a Dockerfile is optional, but included for completeness.
     build: 
       context: .
-      dockerfile: .devcontainer/Dockerfile  # Using a Dockerfile is optional, but included for completeness.
+      dockerfile: .devcontainer/Dockerfile  
 
+    # Application port(s) to expose
     ports:
-     - "3000:3000"  # Application port to forward
+     - "3000:3000"  
 
      volumes:
-      - ..:/workspace  # This is where VS Code should expect to find your project's source code, value of "volume" in .vscode/devContainer.json
+      # This is where VS Code should expect to find your project's source code
+      # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
+      - ..:/workspace  
 
-    command: sleep infinity  # This prevents the container from shutting down if you stop your application
+      # 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
+    command: sleep infinity  
+    

containers/docker-existing-docker-compose/.devcontainer/docker-compose.yml

@@ -20,10 +20,13 @@ services:
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
 
+      # This lets you avoid setting up Git again in the container
+      - ~/.gitconfig:/root/.gitconfig
+
       # Forwarding the socket is optional, but lets docker work inside the container if you install the Docker CLI.
       # See the docker-in-docker-compose definition for details on how to install it.
       - /var/run/docker.sock:/var/run/docker.sock 
 
-    # Overrides default command so things don't shut down after the process ends. Optional, but useful for debugging.
+    # Overrides default command so things don't shut down after the process ends - useful for debugging
     command: sleep infinity 
 

containers/docker-in-docker-compose/.devcontainer/docker-compose.yml

@@ -10,9 +10,14 @@ services:
       context: .
       dockerfile: Dockerfile
     volumes:
+      # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
 
-      # Forwarding the socket is the key to getting this to work
+      # This lets you avoid setting up Git again in the container
+      - ~/.gitconfig:/root/.gitconfig
+
+      # Forwarding the socket is optional, but lets docker work inside the container if you install the Docker CLI.
+      # See the docker-in-docker-compose definition for details on how to install it.
       - /var/run/docker.sock:/var/run/docker.sock 
 
     # Overrides default command so things don't shut down after the process ends - useful for debugging

containers/javascript-node-lts-mongo/.devcontainer/docker-compose.yml

@@ -9,11 +9,18 @@ services:
     build: 
       context: .
       dockerfile: Dockerfile
+    
     volumes:
       - ..:/workspace
+      # 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
     command: sleep infinity
+    
     links:
       - mongo
+
   mongo:
     image: mongo
     volumes:

containers/python-3-postgres/.devcontainer/docker-compose.yml

@@ -5,9 +5,15 @@ services:
     build: 
       context: ..
       dockerfile: .devcontainer/Dockerfile
+
     volumes:
       - ..:/workspace
+      # 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
     command: sleep infinity
+    
   db:
     image: postgres
     restart: always