From 8974da062cb64d0301a9348aea2cc7ebf3344992 Mon Sep 17 00:00:00 2001 From: Joerg Reichert Date: Sat, 5 Mar 2016 23:24:36 +0100 Subject: [PATCH] add env variables when running rspec --- .ci.env | 2 -- .travis.yml | 2 +- docker-compose.yml | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 .ci.env diff --git a/.ci.env b/.ci.env deleted file mode 100644 index 57611d7..0000000 --- a/.ci.env +++ /dev/null @@ -1,2 +0,0 @@ -CI=true -TRAVIS=true \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index fcc7b1e..455618f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ services: script: - docker-compose run web rake db:setup - - docker-compose run web rspec \ No newline at end of file + - docker-compose run web bash -c 'CI=true TRAVIS=true TRAVIS_BRANCH=$TRAVIS_BRANCH TRAVIS_COMMIT=$TRAVIS_COMMIT TRAVIS_JOB_NUMBER=$TRAVIS_JOB_NUMBER TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST TRAVIS_JOB_ID=$TRAVIS_JOB_ID TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG rspec' \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 2d515d9..767a382 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,5 @@ web: - elasticsearch environment: ELASTICSEARCH_URL: 'http://elasticsearch:9200' - env_file: ./.ci.env elasticsearch: image: elasticsearch:1.7