Move db config to yml file

DOCKER.md

@@ -25,7 +25,7 @@ Now change working directory to the `openstreetmap-website`:
 
 ### Database
 
-    cp config/example.database.yml config/database.yml
+    cp config/docker.database.yml config/database.yml
 
 ### App configuration
 

config/docker.database.yml

@@ -0,0 +1,20 @@
+# This configuration is tailored for use with docker-compose. See DOCKER.md for more information.
+
+development:
+  adapter: postgresql
+  database: openstreetmap
+  username: openstreetmap
+  password: openstreetmap
+  host: db
+  encoding: utf8
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  database: osm_test
+  username: postgres
+  password:
+  host: db
+  encoding: utf8

docker-compose.yml

@@ -11,9 +11,6 @@ services:
     command: bundle exec rails s -p 3000 -b '0.0.0.0'
     depends_on:
       - db
-    environment:
-      # DATABASE_URL: postgresql://postgres@db/openstreetmap
-      DATABASE_URL: postgresql://openstreetmap:openstreetmap@db/openstreetmap
 
   db:
     build: