Merged in James's updates

Author: lossyrob

Dockerfile

@@ -2,10 +2,11 @@ FROM centos:7
 
 MAINTAINER Justin Polchlopek <jpolchlopek@azavea.com>
 
-ENV SPARK_HOME /usr/local/spark-2.0.0-bin-hadoop2.7
+ENV SPARK_HOME /usr/local/spark-2.1.0-bin-hadoop2.7
 
-ADD spark-2.0.0-bin-hadoop2.7.tgz /usr/local
+ADD spark-2.1.0-bin-hadoop2.7.tgz /usr/local
 ADD scripts/*.sh /scripts/
+COPY scripts/requirements.txt /tmp
 COPY toree-0.2.0.dev1.tar.gz /tmp
 COPY geotrellis-uberjar-assembly-1.0.0-RC1.jar /tmp
 

Makefile

@@ -11,7 +11,7 @@ IMG  := quay.io/${ORG}/${REPO}
 archives/${TOREE_VERSION}.zip:
 	(cd archives ; curl -L -O "https://github.com/apache/incubator-toree/archive/${TOREE_VERSION}.zip")
 
-spark-2.0.0-bin-hadoop2.7.tgz:
+spark-2.1.0-bin-hadoop2.7.tgz:
 	curl -L -O "http://d3kbcqa49mib13.cloudfront.net/spark-2.1.0-bin-hadoop2.7.tgz"
 
 incubator-toree-${TOREE_VERSION}: archives/${TOREE_VERSION}.zip
@@ -28,8 +28,8 @@ geotrellis-uberjar-assembly-1.0.0-RC1.jar: geotrellis-uberjar/build.sbt
 	(cd geotrellis-uberjar ; ./sbt "assembly")
 	cp geotrellis-uberjar/target/scala-2.11/geotrellis-uberjar-assembly-1.0.0-RC1.jar $@
 
-build: toree-0.2.0.dev1.tar.gz spark-2.0.0-bin-hadoop2.7.tgz geotrellis-uberjar-assembly-1.0.0-RC1.jar
-	docker build -t ${IMG}:${SHA} .
+build: toree-0.2.0.dev1.tar.gz spark-2.1.0-bin-hadoop2.7.tgz geotrellis-uberjar-assembly-1.0.0-RC1.jar
+	docker build --no-cache -t ${IMG}:${SHA} .
 
 run:
 	docker run -it -v $(CURDIR)/notebooks:/opt/notebooks -p 8000:8000 quay.io/geodocker/geotrellis-jupyter:9b577f1

scripts/build.sh

@@ -20,8 +20,7 @@ yum -y install nodejs
 # Install JupyterHub and Jupyter
 yum -y install gcc gcc-c++
 npm install -g configurable-http-proxy
-scl enable rh-python35 'pip install jupyterhub==0.7.2'
-scl enable rh-python35 'pip install --upgrade notebook'
+scl enable rh-python35 'pip install -r /tmp/requirements.txt'
 
 # Install Toree
 scl enable rh-python35 'pip install --pre /tmp/toree-0.2.0.dev1.tar.gz'

scripts/requirements.txt

@@ -0,0 +1,38 @@
+alembic==0.8.9
+bleach==1.5.0
+decorator==4.0.10
+entrypoints==0.2.2
+html5lib==0.9999999
+ipykernel==4.5.2
+ipython==5.1.0
+ipython-genutils==0.1.0
+Jinja2==2.9.4
+jsonschema==2.5.1
+jupyter-client==4.4.0
+jupyter-core==4.2.1
+jupyterhub==0.7.2
+Mako==1.0.6
+MarkupSafe==0.23
+mistune==0.7.3
+nbconvert==5.0.0
+nbformat==4.2.0
+notebook==4.3.1
+pamela==0.3.0
+pandocfilters==1.4.1
+pexpect==4.2.1
+pickleshare==0.7.4
+prompt-toolkit==1.0.9
+ptyprocess==0.5.1
+Pygments==2.1.3
+python-editor==1.0.3
+pyzmq==16.0.2
+requests==2.12.4
+simplegeneric==0.8.1
+six==1.10.0
+SQLAlchemy==1.1.4
+terminado==0.6
+testpath==0.3
+tornado==4.4.2
+traitlets==4.3.1
+virtualenv==13.1.2
+wcwidth==0.1.7