Merge pull request #1052 from rughh/chore/update-dev-setup

Update the development setup

config/database.yml

@@ -4,14 +4,15 @@ development: &default
   min_messages: WARNING
   pool: 5
   username: postgres
-  host: <%= ENV["POSTGRES_PORT_5432_TCP_ADDR"] || 'localhost' %>
+  password: <%= ENV["POSTGRES_PASSWORD"] || "INSECURE_LOCAL_DEVELOPMENT_PASSWORD" %>
+  host: <%= ENV["POSTGRES_PORT_5432_TCP_ADDR"] || '127.0.0.1' %>
   port: <%= ENV["POSTGRES_PORT_5432_TCP_PORT"] || 5432 %>
 
 test:
   <<: *default
   database: onruby_test
 
 production:
-  url:  <%= ENV["DATABASE_URL"] %>
+  url: <%= ENV["DATABASE_URL"] %>
   pool: <%= ENV["DB_POOL"] || ENV["MAX_THREADS"] || 5 %>
-  encoding: utf8
+  encoding: utf8

docker-compose.yml

@@ -1,16 +1,7 @@
-postgres:
-  image: postgres:9.4.1
-box:
-  image: busybox
-  volumes:
-    - /box
-web:
-  build: .
-  ports:
-    - "3000:3000"
-  links:
-    - postgres
-  volumes:
-    - .:/app
-  volumes_from:
-    - box
+services:
+  postgres:
+    image: postgres:14.12
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_PASSWORD: INSECURE_LOCAL_DEVELOPMENT_PASSWORD

readme.md

@@ -91,6 +91,15 @@ This will list links and logos to all the usergroups.
 
 ### Install locally
 
+### On a Docker Container
+
+```sh
+docker-compose up postgres -d
+
+./bin/setup
+./bin/rails server
+```
+
 ### On your machine
 
 #### Install PostgreSQL