From 84c0681aeaeb25769c1625cf5aac72ffb83c8b8a Mon Sep 17 00:00:00 2001 From: Joerg Reichert Date: Sat, 5 Mar 2016 22:49:59 +0100 Subject: [PATCH] set environment so that coveralls send data --- .ci.env | 2 ++ .travis.yml | 5 +---- docker-compose.yml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 .ci.env diff --git a/.ci.env b/.ci.env new file mode 100644 index 0000000..57611d7 --- /dev/null +++ b/.ci.env @@ -0,0 +1,2 @@ +CI=true +TRAVIS=true \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index d383325..5ba6966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,6 @@ language: ruby services: - docker -after_success: -- CI=true TRAVIS=true coveralls --verbose - script: - docker-compose run web rake db:setup - - docker-compose run web rspec \ No newline at end of file + - docker-compose -e ENV_FILE=./.ci.env run web rspec \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 767a382..aedaa51 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,5 +8,6 @@ web: - elasticsearch environment: ELASTICSEARCH_URL: 'http://elasticsearch:9200' + env_file: ${ENV_FILE} elasticsearch: image: elasticsearch:1.7