From 580d8c6fce866b52d4aab0373cc67cd3b87fb9c6 Mon Sep 17 00:00:00 2001
From: Joerg Reichert <de.abg.reichert.joerg@googlemail.com>
Date: Sat, 5 Mar 2016 22:56:03 +0100
Subject: [PATCH] set ci environment

---
 .travis.yml        | 2 +-
 docker-compose.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5ba6966..fcc7b1e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,4 +7,4 @@ services:
   
 script:
   - docker-compose run web rake db:setup
-  - docker-compose -e ENV_FILE=./.ci.env run web rspec 
\ No newline at end of file
+  - docker-compose run web rspec 
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index aedaa51..2d515d9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,6 @@ web:
     - elasticsearch
   environment:
     ELASTICSEARCH_URL: 'http://elasticsearch:9200'
-  env_file: ${ENV_FILE}
+  env_file: ./.ci.env
 elasticsearch:
   image: elasticsearch:1.7