From 9534032be03fd4d39f914efb9d3541150d38723f Mon Sep 17 00:00:00 2001 From: Kevin Buchanan Date: Tue, 5 Jan 2016 13:45:09 -0600 Subject: [PATCH] Set env to ci in ci --- config/database.yml | 5 ++++- config/options.yml | 3 +++ config/redis.yml | 6 ++++-- docker/docker-compose.ci.yml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/config/database.yml b/config/database.yml index 2f331ac..891ae74 100644 --- a/config/database.yml +++ b/config/database.yml @@ -12,7 +12,7 @@ test: <<: *common database: backbeat_test -docker: +docker: &docker <<: *common reconnect: true adapter: postgresql @@ -21,3 +21,6 @@ docker: database: backbeat_docker host: database schema_search_path: public + +ci: + <<: *docker diff --git a/config/options.yml b/config/options.yml index 9fd63cd..664da61 100644 --- a/config/options.yml +++ b/config/options.yml @@ -7,3 +7,6 @@ test: docker: log: ~ + +ci: + log: /dev/null diff --git a/config/redis.yml b/config/redis.yml index 23be267..7703ec9 100644 --- a/config/redis.yml +++ b/config/redis.yml @@ -10,7 +10,9 @@ test: <<: *common namespace: backbeat_test -docker: - namespace: backbeat +docker: &docker host: redis port: 6379 + +ci: + <<: *docker diff --git a/docker/docker-compose.ci.yml b/docker/docker-compose.ci.yml index 76dd568..536fd79 100644 --- a/docker/docker-compose.ci.yml +++ b/docker/docker-compose.ci.yml @@ -5,7 +5,7 @@ ci: command: bin/run-tests.sh restart: never environment: - RACK_ENV: docker + RACK_ENV: ci links: - database - redis