Trim comments (CI Ignore)

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

@@ -37,6 +37,6 @@
 	// Uncomment the next line to run commands after the container is created - for example installing curl.
 	// "postCreateCommand": "apt-get update && apt-get install -y curl",
 
-	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
 }

containers/docker-existing-dockerfile/.devcontainer/devcontainer.json

@@ -27,6 +27,6 @@
 	// Uncomment to use the Docker CLI from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker.
 	// "mounts": [ "source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind" ],
 
-	// Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"
 }

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

@@ -1,17 +1,17 @@
 version: '3'
 services:
   docker-from-docker:
-    # Uncomment the next line to use a non-root user for all processes. You can also
-    # simply use the "remoteUser" property in devcontainer.json if you just want VS Code
-    # and its sub-processes (terminals, tasks, debugging) to execute as the user. On Linux,
-    # you may need to update USER_UID and USER_GID in .devcontainer/Dockerfile to match your
-    # user if not 1000. See https://aka.ms/vscode-remote/containers/non-root for details.
-    #
+    # Uncomment the next line to use a non-root user for all processes.
+    # See https://aka.ms/vscode-remote/containers/non-root for details.
     # user: vscode
 
     build: 
       context: .
       dockerfile: Dockerfile
+      args:
+        # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
+        USER_UID: 1000
+        USER_GID: 1000
 
     volumes:
       # Update this to wherever you want VS Code to mount the folder of your project

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

@@ -1,16 +1,15 @@
 version: '3'
 services:
   web:
-    # Uncomment the next line to use a non-root user for all processes. Update the "remoteUser" property 
-    # in devcontainer.json if you just want VS Code and its sub-processes to execute as the user. 
+    # Uncomment the next line to use a non-root user for all processes.
     # See https://aka.ms/vscode-remote/containers/non-root for details.
-    #
     # user: node
 
     build: 
       context: .
       dockerfile: Dockerfile
       args:
+        # Update VARIANT to pick a node version: 14, 12, 10
         VARIANT: 12
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: 1000

containers/javascript-node-postgres/.devcontainer/docker-compose.yml

@@ -1,16 +1,15 @@
 version: '3'
 services:
   web:
-    # Uncomment the next line to use a non-root user for all processes. Update the "remoteUser" property 
-    # in devcontainer.json if you just want VS Code and its sub-processes to execute as the user. 
+    # Uncomment the next line to use a non-root user for all processes.
     # See https://aka.ms/vscode-remote/containers/non-root for details.
-    #
     # user: node
 
     build: 
       context: .
       dockerfile: Dockerfile
       args:
+        # Update VARIANT to pick a node version: 14, 12, 10
         VARIANT: 12
         # On Linux, you may need to update USER_UID and USER_GID below if not your local UID is not 1000.
         USER_UID: 1000

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

@@ -2,18 +2,15 @@ version: '3'
 
 services:
   app:
-    # Uncomment the next line to use a non-root user for all processes. You can also
-    # simply use the "remoteUser" property in devcontainer.json if you just want
-    # VS Code and its sub-processes (terminals, tasks, debugging) to execute as the user
-    # On Linux, you may need to update the args USER_UID and USER_GID the "build" section
-    # to match your user if not 1000. See https://aka.ms/vscode-remote/containers/non-root for details.
+    # Uncomment the next line to use a non-root user for all processes.
+    # See https://aka.ms/vscode-remote/containers/non-root for details.
     # user: vscode
 
     build: 
       context: ..
       dockerfile: .devcontainer/Dockerfile
       args:
-        #
+        # Update VARIANT to pick a python version: 3, 3.8, 3.7, 3.6
         VARIANT: 3
         USER_UID: 1000
         USER_GID: 1000