From e893197c491ace5f1e434de05ef18f2c80c1ca7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Turbelin?= <pacodelaluna@gmail.com>
Date: Sun, 23 Jun 2019 13:23:24 +0200
Subject: [PATCH] Use example files instead of extra Docker ones

---
 ...ion.docker.yml => application.example.yml} |  0
 config/database.docker.yml                    | 19 -----------
 config/database.yml                           | 34 ++++++-------------
 docker-compose.yml                            |  4 +--
 4 files changed, 12 insertions(+), 45 deletions(-)
 rename config/{application.docker.yml => application.example.yml} (100%)
 delete mode 100644 config/database.docker.yml

diff --git a/config/application.docker.yml b/config/application.example.yml
similarity index 100%
rename from config/application.docker.yml
rename to config/application.example.yml
diff --git a/config/database.docker.yml b/config/database.docker.yml
deleted file mode 100644
index 9ef24edfd3..0000000000
--- a/config/database.docker.yml
+++ /dev/null
@@ -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
diff --git a/config/database.yml b/config/database.yml
index d313dd74e4..9ef24edfd3 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -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
diff --git a/docker-compose.yml b/docker-compose.yml
index 32c7e52a63..b0825ded79 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -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: