use special dockerfile for travis

developmentseed · Oct 29, 2015 · 579a339 · 579a339
1 parent f4fa584
commit 579a339
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ services:
   - docker
 
 before_script:
-- docker build -t 'developmentseed/landsat-util:travis' .
+- docker build --file="travis-dockerfile" -t "developmentseed/landsat-util:travis" .
 
 script:
 - docker run --rm -it -v "$(pwd)":/test developmentseed/landsat-util:travis nosetests
@@ -26,3 +26,4 @@ after_deploy:
     docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
     docker push developmentseed/landsat-util:$VER
   fi
+  docker push developmentseed/landsat-util:travis
diff --git a/Dockerfile b/Dockerfile
@@ -5,4 +5,3 @@ ADD     landsat /usr/local/lib/python2.7/dist-packages/landsat
 ADD     bin/landsat /usr/local/bin/
 ADD     . /landsat
 RUN     cd /landsat && pip install -r requirements/docker.txt
-RUN     pip install pdoc>=0.3.1 nose>=1.3.7 coverage>=4.0 Sphinx>=1.3.1 wheel>=0.26.0 mock>=1.3.0
diff --git a/travis-dockerfile b/travis-dockerfile
@@ -0,0 +1,4 @@
+FROM    developmentseed/landsat-util:dev
+ADD     . /test
+RUN     cd /test && pip install -r requirements/docker.txt
+RUN     pip install pdoc>=0.3.1 nose>=1.3.7 coverage>=4.0 Sphinx>=1.3.1 wheel>=0.26.0 mock>=1.3.0