Skip to content
Browse files

Update to leverage Docker Compose over Fig

  • Loading branch information...
1 parent 871770a commit 39603fefa91a371af89b5353ddd5120c3e45588e @joshuaclayton committed Mar 3, 2016
Showing with 20 additions and 19 deletions.
  1. +3 −3 README.md
  2. +1 −2 config/database.yml
  3. +16 −0 docker-compose.yml
  4. +0 −14 fig.yml
View
6 README.md
@@ -24,15 +24,15 @@ later.
## Start the app
- $ fig up web
+ $ docker-compose up web
## Bootstrap Data
- $ fig run web rake db:bootstrap
+ $ docker-compose run web rake db:bootstrap
## Run Tests
- $ fig run web rake
+ $ docker-compose run web rake
## License
View
3 config/database.yml
@@ -4,8 +4,7 @@ development: &default
min_messages: WARNING
pool: 5
username: postgres
- host: <%= ENV['BACKBONEDATABOOTSTRAP_DB_1_PORT_5432_TCP_ADDR'] %>
- port: <%= ENV['BACKBONEDATABOOTSTRAP_DB_1_PORT_5432_TCP_PORT'] %>
+ host: db
test:
<<: *default
View
16 docker-compose.yml
@@ -0,0 +1,16 @@
+version: '2'
+services:
+ db:
+ image: postgres:9.4.1
+ ports:
+ - "5432:5432"
+
+ web:
+ build: .
+ command: bin/rails server --port 3000 --binding 0.0.0.0
+ ports:
+ - "3000:3000"
+ links:
+ - db
+ volumes:
+ - .:/myapp
View
14 fig.yml
@@ -1,14 +0,0 @@
-db:
- image: postgres:9.4.1
- ports:
- - "5432:5432"
-
-web:
- build: .
- command: bin/rails server --port 3000 --binding 0.0.0.0
- ports:
- - "3000:3000"
- links:
- - db
- volumes:
- - .:/myapp

0 comments on commit 39603fe

Please sign in to comment.
Something went wrong with that request. Please try again.