From 08b25d12d54dafc17ae75417306560778ea94ba6 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Thu, 13 Jun 2019 20:59:45 +0000 Subject: [PATCH] Fix LF --- .editorconfig | 20 +++---- containers/java-11/test-project/.project | 46 ++++++++-------- .../src/main/java/module-info.java | 16 +++--- containers/python-3-miniconda/environment.yml | 8 +-- .../.devcontainer/docker-compose.yml | 52 +++++++++---------- containers/python-3-postgres/requirements.txt | 2 +- 6 files changed, 72 insertions(+), 72 deletions(-) diff --git a/.editorconfig b/.editorconfig index f48b747e29..de20bdee77 100644 --- a/.editorconfig +++ b/.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 diff --git a/containers/java-11/test-project/.project b/containers/java-11/test-project/.project index c71226c8d5..700a32c79d 100644 --- a/containers/java-11/test-project/.project +++ b/containers/java-11/test-project/.project @@ -1,23 +1,23 @@ - - - my-app - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - + + + my-app + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/containers/java-11/test-project/src/main/java/module-info.java b/containers/java-11/test-project/src/main/java/module-info.java index fdde3e1f12..dbf1c3226a 100644 --- a/containers/java-11/test-project/src/main/java/module-info.java +++ b/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; } \ No newline at end of file diff --git a/containers/python-3-miniconda/environment.yml b/containers/python-3-miniconda/environment.yml index 53fc983c73..625f8ac3d0 100644 --- a/containers/python-3-miniconda/environment.yml +++ b/containers/python-3-miniconda/environment.yml @@ -1,4 +1,4 @@ -dependencies: - - jupyter - - numpy - - matplotlib +dependencies: + - jupyter + - numpy + - matplotlib diff --git a/containers/python-3-postgres/.devcontainer/docker-compose.yml b/containers/python-3-postgres/.devcontainer/docker-compose.yml index 554db7ca61..83dc970049 100644 --- a/containers/python-3-postgres/.devcontainer/docker-compose.yml +++ b/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 diff --git a/containers/python-3-postgres/requirements.txt b/containers/python-3-postgres/requirements.txt index b085736ab1..a2870a734f 100644 --- a/containers/python-3-postgres/requirements.txt +++ b/containers/python-3-postgres/requirements.txt @@ -1,2 +1,2 @@ -Django +Django psycopg2-binary \ No newline at end of file