Skip to content

Commit

Permalink
Set env to ci in ci
Browse files Browse the repository at this point in the history
  • Loading branch information
kevbuchanan authored and Naren Chainani committed Mar 31, 2016
1 parent c253733 commit 9534032
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
5 changes: 4 additions & 1 deletion config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ test:
<<: *common
database: backbeat_test

docker:
docker: &docker
<<: *common
reconnect: true
adapter: postgresql
Expand All @@ -21,3 +21,6 @@ docker:
database: backbeat_docker
host: database
schema_search_path: public

ci:
<<: *docker
3 changes: 3 additions & 0 deletions config/options.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ test:

docker:
log: ~

ci:
log: /dev/null
6 changes: 4 additions & 2 deletions config/redis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ test:
<<: *common
namespace: backbeat_test

docker:
namespace: backbeat
docker: &docker
host: redis
port: 6379

ci:
<<: *docker
2 changes: 1 addition & 1 deletion docker/docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ci:
command: bin/run-tests.sh
restart: never
environment:
RACK_ENV: docker
RACK_ENV: ci
links:
- database
- redis
Expand Down

0 comments on commit 9534032

Please sign in to comment.