Use example files instead of extra Docker ones

This commit is contained in:
François Turbelin
2019-06-23 13:23:24 +02:00
parent 60e67ae1a4
commit e893197c49
4 changed files with 12 additions and 45 deletions

View File

@@ -1,19 +0,0 @@
default: &default
adapter: postgresql
encoding: utf8
pool: 5
timeout: 5000
host: db
port: 5432
development:
<<: *default
database: open_food_network_dev
username: ofn
password: f00d
test:
<<: *default
database: open_food_network_test
username: ofn
password: f00d

View File

@@ -1,33 +1,19 @@
development:
default: &default
adapter: postgresql
encoding: unicode
database: open_food_network_dev
encoding: utf8
pool: 5
host: localhost
timeout: 5000
host: db
port: 5432
development:
<<: *default
database: open_food_network_dev
username: ofn
password: f00d
test:
adapter: postgresql
encoding: unicode
<<: *default
database: open_food_network_test
pool: 5
host: localhost
username: ofn
password: f00d
production:
adapter: postgresql
encoding: unicode
database: open_food_network_prod
pool: 5
username: ofn
password: f00d
staging:
adapter: postgresql
encoding: unicode
database: open_food_network_prod
pool: 5
username: ofn
password: f00d

View File

@@ -18,8 +18,8 @@ services:
volumes:
- .:/usr/src/app
- gems:/bundles
- ./config/database.docker.yml:/usr/src/app/config/database.yml
- ./config/application.docker.yml:/usr/src/app/config/application.yml
- ./config/database.yml:/usr/src/app/config/database.yml
- ./config/application.example.yml:/usr/src/app/config/application.yml
depends_on:
- db
environment: