Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
Fix LF
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuxel committed Jun 13, 2019
1 parent 7c6915d commit 08b25d1
Show file tree
Hide file tree
Showing 6 changed files with 72 additions and 72 deletions.
20 changes: 10 additions & 10 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -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
46 changes: 23 additions & 23 deletions containers/java-11/test-project/.project
Original file line number Diff line number Diff line change
@@ -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>

This comment has been minimized.

Copy link
@Max1178

Max1178 Nov 3, 2021

``

</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>
16 changes: 8 additions & 8 deletions containers/java-11/test-project/src/main/java/module-info.java
Original file line number Diff line number Diff line change
@@ -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;
}
8 changes: 4 additions & 4 deletions containers/python-3-miniconda/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- jupyter
- numpy
- matplotlib
dependencies:
- jupyter
- numpy
- matplotlib
52 changes: 26 additions & 26 deletions containers/python-3-postgres/.devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion containers/python-3-postgres/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Django
Django
psycopg2-binary

0 comments on commit 08b25d1

Please sign in to comment.