Skip to content
Prev Previous commit
Next Next commit
Tidy docker setup
  • Loading branch information
michael-misshore committed Dec 29, 2017
commit 409ddc4602fbc11a8cdd17a4c35f6427c858aec6
15 changes: 3 additions & 12 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,13 @@ services:
- .:/app:rw
volumes_from:
- data
depends_on:
- postgres
env_file: docker/ruby/.env
container_name: criticalpathcss_ruby

postgres:
image: postgres:10.1
ports:
- 5432:5432
volumes_from:
- data
env_file: ./docker/postgres/config

data:
image: postgres:10.1
build:
context: .
dockerfile: docker/ruby/Dockerfile
volumes:
- /var/lib/postgresql/data
- /gems
command: "true"
2 changes: 0 additions & 2 deletions docker/postgres/config

This file was deleted.

5 changes: 0 additions & 5 deletions docker/ruby/.env
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
RAILS_ENV=development
DATABASE_HOST=postgres
DATABASE_NAME=critical_path_css_development
DATABASE_USERNAME=docker
DATABASE_PASSWORD=docker
DATABASE_TEST_NAME=critical_path_css_test