Merge pull request #349 from s22s/fix/347

Added rasterio and decartes to Docker image

Author: metasim

rf-notebook/build.sbt

@@ -4,7 +4,7 @@ import PythonBuildPlugin.autoImport.pyWhl
 lazy val includeNotebooks = settingKey[Boolean]("Whether to build documentation into notebooks and include them")
 includeNotebooks := true
 
-Docker / packageName := "rasterframes-notebook"
+Docker / packageName := "s22s/rasterframes-notebook"
 
 Docker / version := version.value
 

rf-notebook/src/main/docker/Dockerfile

@@ -13,21 +13,18 @@ EXPOSE 4040 4041 4042 4043 4044
 
 # Sphinx (for Notebook->html)
 RUN conda install --quiet --yes \
-    anaconda sphinx nbsphinx shapely numpy folium geopandas geojsonio
+    anaconda sphinx nbsphinx shapely numpy folium geopandas geojsonio rasterio descartes
 
 # Cleanup pip residuals
 RUN rm -rf /home/$NB_USER/.local && \
-    fix-permissions /home/$NB_USER
-
-# Note: The above step takes an insanely long time in the CONDA_DIR, so commenting it out until we have perm issues.
-#    fix-permissions $CONDA_DIR
+    fix-permissions /home/$NB_USER && \
+    fix-permissions $CONDA_DIR
 
 COPY *.whl $RF_LIB_LOC
-RUN ls -1 $RF_LIB_LOC/*.whl | xargs pip install
 COPY jupyter_notebook_config.py $HOME/.jupyter
 COPY examples $HOME/examples
-RUN chmod -R +w $HOME/examples
 
-RUN chown -R $NB_UID:$NB_GID $HOME
+RUN ls -1 $RF_LIB_LOC/*.whl | xargs pip install
+RUN chmod -R +w $HOME/examples && chown -R $NB_UID:$NB_GID $HOME
 
 USER $NB_UID