Skip to content

Commit 409ddc4

Browse files
Tidy docker setup
1 parent 3b60430 commit 409ddc4

File tree

3 files changed

+3
-19
lines changed

3 files changed

+3
-19
lines changed

docker-compose.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,13 @@ services:
88
- .:/app:rw
99
volumes_from:
1010
- data
11-
depends_on:
12-
- postgres
1311
env_file: docker/ruby/.env
1412
container_name: criticalpathcss_ruby
1513

16-
postgres:
17-
image: postgres:10.1
18-
ports:
19-
- 5432:5432
20-
volumes_from:
21-
- data
22-
env_file: ./docker/postgres/config
23-
2414
data:
25-
image: postgres:10.1
15+
build:
16+
context: .
17+
dockerfile: docker/ruby/Dockerfile
2618
volumes:
27-
- /var/lib/postgresql/data
2819
- /gems
2920
command: "true"

docker/postgres/config

Lines changed: 0 additions & 2 deletions
This file was deleted.

docker/ruby/.env

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1 @@
11
RAILS_ENV=development
2-
DATABASE_HOST=postgres
3-
DATABASE_NAME=critical_path_css_development
4-
DATABASE_USERNAME=docker
5-
DATABASE_PASSWORD=docker
6-
DATABASE_TEST_NAME=critical_path_css_test

0 commit comments

Comments
 (0)