Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
oiahoon committed Dec 5, 2017
2 parents 513220a + d8c568a commit b214d02
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: '2'
services:
db:
container_name: poker_db_production
image: mysql
ports:
- "3306"
Expand All @@ -11,6 +12,7 @@ services:
MYSQL_USER: root
MYSQL_PASSWORD: root
app:
container_name: poker_app_production
build: ./poker
command: bundle exec rails s -p 3000 -b 0.0.0.0 -e production
volumes:
Expand All @@ -20,6 +22,7 @@ services:
links:
- db
nginx:
container_name: poker_nginx_production
image: nginx
volumes_from:
- app
Expand Down

0 comments on commit b214d02

Please sign in to comment.