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

Author: Chuxel

.editorconfig

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

containers/java-11/test-project/.project

@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>my-app</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>my-app</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

containers/java-11/test-project/src/main/java/module-info.java

@@ -1,9 +1,9 @@
-/*--------------------------------------------------------------------------------------------------------------
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
- *-------------------------------------------------------------------------------------------------------------*/
-
-module mymodule {
-    requires java.base;
-    requires java.xml;
+/*--------------------------------------------------------------------------------------------------------------
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+ *-------------------------------------------------------------------------------------------------------------*/
+
+module mymodule {
+    requires java.base;
+    requires java.xml;
 }

containers/python-3-miniconda/environment.yml

@@ -1,4 +1,4 @@
-dependencies:
-  - jupyter
-  - numpy
-  - matplotlib
+dependencies:
+  - jupyter
+  - numpy
+  - matplotlib

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

@@ -1,26 +1,26 @@
-version: '3'
-
-services:
-  app:
-    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.
-    command: sleep infinity
-    
-    links: 
-      - db
-    
-  db:
-    image: postgres
-    restart: always
-    ports: 
-      - 5432:5432
-    environment:
-      POSTGRES_PASSWORD: LocalPassword
+version: '3'
+
+services:
+  app:
+    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.
+    command: sleep infinity
+    
+    links: 
+      - db
+    
+  db:
+    image: postgres
+    restart: always
+    ports: 
+      - 5432:5432
+    environment:
+      POSTGRES_PASSWORD: LocalPassword

containers/python-3-postgres/requirements.txt

@@ -1,2 +1,2 @@
-Django
+Django
 psycopg2-binary