diff --git a/docker-compose.yml b/docker-compose.yml index 7dea71b..fdf3b4e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,17 @@ services: # ports: # - "6379:6379" + rails_app: + build: rails-app/. + command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'" + volumes: + - ./rails-app:/app + - /app/tmp + ports: + - "3000:3000" + depends_on: + - db + super_graph: build: context: . @@ -24,17 +35,6 @@ services: command: fresh -c fresh.conf depends_on: - db - - rails_app: - build: rails-app/. - command: bash -c "rm -f tmp/pids/server.pid && bundle exec rails s -p 3000 -b '0.0.0.0'" - volumes: - - ./rails-app:/app - - /app/tmp - ports: - - "3000:3000" - depends_on: - - db - - super_graph + - rails_app # - redis diff --git a/rails-app/demo.yml b/rails-app/demo.yml index d474962..776279e 100644 --- a/rails-app/demo.yml +++ b/rails-app/demo.yml @@ -3,16 +3,7 @@ services: db: image: postgres tmpfs: /var/lib/postgresql/data - - super_graph: - image: dosco/super-graph:latest - environment: - GO_ENV: "development" - depends_on: - - db - ports: - - "8080:8080" - + rails_app: image: dosco/super-graph-demo:latest environment: @@ -22,4 +13,13 @@ services: - "3000:3000" depends_on: - db - - super_graph \ No newline at end of file + + super_graph: + image: dosco/super-graph:latest + environment: + GO_ENV: "development" + ports: + - "8080:8080" + depends_on: + - db + - rails_app \ No newline at end of file