Skip to content

Commit ffab297

Browse files
committed
Configure docker database
To work for local developers as well as docker users
1 parent a4cc897 commit ffab297

File tree

3 files changed

+20
-2
lines changed

3 files changed

+20
-2
lines changed

config/database.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ development: &dev
22
adapter: postgresql
33
encoding: unicode
44
database: websiteone_development
5-
host: db
65
pool: 20
76
username: postgres
87
password:

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ services:
99
command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'"
1010
volumes:
1111
- webVolume:/WebsiteOne
12+
- ./docker/config/database.yml:/WebsiteOne/config/database.yml
1213
ports:
1314
- "3000:3000"
1415
depends_on:
1516
- db
1617

1718
volumes:
1819
dbVolume:
19-
webVolume:
20+
webVolume:

docker/config/database.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
development: &dev
2+
adapter: postgresql
3+
encoding: unicode
4+
database: websiteone_development
5+
host: db
6+
pool: 20
7+
username: postgres
8+
password:
9+
test: &test
10+
<<: *dev
11+
database: websiteone_test
12+
13+
production:
14+
<<: *dev
15+
database: websiteone_production
16+
17+
cucumber:
18+
<<: *test

0 commit comments

Comments
 (0)