Merge pull request planetlabs#61 from planetlabs/update-dockerfile

Update dockerfile, drop python2.7

Author: sarasafavi

jupyter-notebooks/data-api-tutorials/planet_cli_introduction.ipynb

@@ -1,10 +1,38 @@
 FROM planet-notebooks
 
+# libsqlite3-dev and zlib1g-dev are dependencies of tippicanoe
+# libcurl4-openssl-dev is a dependency for pycurl
+USER root
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    git \
+    libcurl4-openssl-dev \
+    libsqlite3-dev \
+    zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# Install tippecanoe (required for label-maker)
+RUN git clone https://github.com/mapbox/tippecanoe.git
+WORKDIR tippecanoe
+RUN make && make install
+WORKDIR ..
+
+# Install label-maker
+# Currently label-maker does not recognize planet COG files
+# because they do not end in `.tif`. For now, we install
+# label-maker from the fixed version in a fork
+# ref: https://github.com/developmentseed/label-maker/pull/82
+
+# USER $NB_USER
+# RUN pip install --upgrade pip && \
+#     pip install label-maker==0.3.1
+
 USER root
 RUN apt-get install git
 RUN git clone https://github.com/jreiberkyle/label-maker.git
 WORKDIR label-maker
 RUN git checkout geotiff-download-80
+USER $NB_USER
 RUN pip install .
 WORKDIR ..
 USER $NB_USER

jupyter-notebooks/data-api-tutorials/planet_data_api_introduction.ipynb

@@ -1,8 +1,4 @@
 FROM jupyter/minimal-notebook:2c80cf3537ca
-# c88678a1c7c9
-
-# Create Python2 environment
-RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7
 
 # Install GDAL
 # We use conda because it is the only way to get gdal working properly with ipython
@@ -11,89 +7,26 @@ RUN conda create --yes -p $CONDA_DIR/envs/python2 python=2.7
 # Downloading and building results in the gdal vsicurl driver not working
 # (not sure why)
 RUN conda install -y -c conda-forge gdal=2.3.1
-RUN conda install -y --name python2 -c conda-forge gdal=2.3.1
-
-# Add pip2.7 shortcut and install Python2 packages
-RUN ln -s $CONDA_DIR/envs/python2/bin/pip $CONDA_DIR/bin/pip2.7 && \
-    pip2.7 install --upgrade pip && \
-    pip2.7 install numpy>=1.13.1 && \
-    pip2.7 install \
-        geojsonio \
-        geopandas \
-        ipykernel \
-        ipyleaflet \
-        ipywidgets \
-        matplotlib \
-        numpy \
-        opencv-python==3.3.0.10 \
-        planet \
-        pygdal==2.3.1.4 \
-        pyproj \
-        rasterio==1.0a12 \
-        setuptools \
-        scikit-image \
-        shapely \
-        scikit-learn \
-        tqdm
-
-# Install tippecanoe (required for label-maker)
-USER root
-RUN apt-get update && apt-get install -y \
-    build-essential \
-    git \
-    libsqlite3-dev \
-    zlib1g-dev 
-
-RUN git clone https://github.com/mapbox/tippecanoe.git
-WORKDIR tippecanoe
-RUN make && make install
-WORKDIR ..
-
-
-# Install dependencies for pycurl, a dependency of label-maker
-RUN apt-get update && apt-get install -y libcurl4-openssl-dev
 
 # Add pip shortcut and install Python3 packages
-USER $NB_USER
+COPY requirements.txt .
 RUN pip install --upgrade pip && \
-    pip install numpy>=1.13.1 && \
-    pip install \
-        geojson \
-        geopandas \
-        ipyleaflet \
-        ipywidgets \
-        label-maker==0.3.1 \
-        matplotlib \
-        numpy \
-        opencv-python==3.3.0.10 \
-        planet \
-        pygdal==2.3.1.4 \
-        pyproj \
-        rasterio==1.0a12 \
-        scikit-image \
-        shapely \
-        tqdm
-
-# Activate Python2 kernel globally and upon kernel launch.
-USER root
-RUN pip install kernda --no-cache && \
-    $CONDA_DIR/envs/python2/bin/python -m ipykernel install && \
-    kernda -o -y /usr/local/share/jupyter/kernels/python2/kernel.json && \
-    pip uninstall kernda -y
+    pip install -r requirements.txt 
 
 # Enable Jupyter extentions
-USER $NB_USER
 RUN jupyter nbextension enable --py widgetsnbextension --sys-prefix && \
     jupyter nbextension enable --py --sys-prefix ipyleaflet
 
-# Clean up
-USER root
-RUN rm -rf /var/lib/{apt,dpkg,cache,log}/
-
 # fix certs for rasterio
 # https://stackoverflow.com/a/30154802/2344416
+USER root
 RUN mkdir -p /etc/pki/tls/certs
 RUN cp /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt
 
+# fix ncurses install
+# ref: https://github.com/conda-forge/gdal-feedstock/issues/226
+USER root
+RUN conda install -y -c conda-forge ncurses
+
 WORKDIR work
 USER $NB_USER

jupyter-notebooks/label-data/Dockerfile

@@ -0,0 +1,15 @@
+geojson
+geojsonio
+geopandas
+ipyleaflet
+ipywidgets
+matplotlib 
+numpy==1.14.* # pinned because numpy 15.0 throws runtime warning 
+opencv-python==3.3.0.10
+planet
+pyproj
+rasterio==1.0a12
+scikit-image
+scikit-learn
+shapely
+tqdm