Skip to content

Commit

Permalink
Rework docker bits
Browse files Browse the repository at this point in the history
  • Loading branch information
tvon-a committed Jan 23, 2017
1 parent c4b5d0d commit a709fef
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ To run commands in the context of the container, e.g., `rails console`:
```
docker-compose run --rm app rails console
```

8 changes: 1 addition & 7 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,7 @@
# Ensure the SQLite 3 gem is defined in your Gemfile
# gem 'sqlite3'
development: &default
adapter: postgresql
database: <%= ENV['DB_NAME'] || 'crb_dev_duex' %>
username: <%= ENV['DB_USERNAME'] || 'postgres' %>
password: <%= ENV['DB_PASSWORD'] %>
host: <%= ENV['DB_HOST'] || 'localhost' %>
encoding: unicode
pool: 5
url: <%= ENV['DATABASE_URL'] %>

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
Expand Down
6 changes: 1 addition & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,10 @@ services:
links:
- postgres
environment:
DB_NAME: crb_dev_duex
DB_USERNAME: postgres
DB_PASSWORD: password
DB_HOST: postgres
DATABASE_URL: postgresql://postgres:password@postgres/crb_development?pool=5

postgres:
image: postgres:9.6
container_name: columbusrb.com-postgres
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: password

0 comments on commit a709fef

Please sign in to comment.