Fix build

mpasternak · Nov 13, 2017 · 81e8e75 · 81e8e75
1 parent 716d18b
commit 81e8e75
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,12 +18,11 @@ services:
       - TRAVIS
       - TRAVIS_JOB_ID
       - TRAVIS_BRANCH
+      - DJANGO_LIVE_TEST_SERVER_ADDRESS=test
     ports:
       - 9500
     volumes:
       - .:/usr/src/app
-    environment:
-      - DJANGO_LIVE_TEST_SERVER_ADDRESS=test
     links:
       - db
       - selenium

diff --git a/test_project/runtests.sh b/test_project/runtests.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
-set
+echo "TRAVIS_JOB_ID=$TRAVIS_JOB_ID"
+echo "DJANGO_LIVE_TEST_SERVER_ADDRESS=$DJANGO_LIVE_TEST_SERVER_ADDRESS"
 
 export PYTHONPATH=..:$PYTHONPATH
 export DJANGO_SETTINGS_MODULE=test_project.settings

diff --git a/tox.ini b/tox.ini
@@ -7,6 +7,7 @@ usedevelop = true
 commands =
 	 ./runtests.sh
 	 coveralls
+
 passenv =
      DJANGO_LIVE_TEST_SERVER_ADDRESS
      TRAVIS
@@ -16,4 +17,4 @@ passenv =
 deps = 
      django110: django>=1.10,<1.11
      django111: django>=1.11,<1.12
-     -r{toxinidir}/requirements_dev.txt
+     -r{toxinidir}/requirements_dev.txt