Merge pull request #3032 from AustinRochford/fix-Dockerfile-pip-10

Make docker build work

Author: AustinRochford

scripts/Dockerfile

@@ -1,22 +1,11 @@
 FROM jupyter/minimal-notebook
 
-MAINTAINER Austin Rochford <[email protected]>
-
-USER root
+ARG SRC_DIR
 
-# install libav-tools to support matplotlib animations
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends libav-tools && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-USER $NB_USER
+MAINTAINER Austin Rochford <[email protected]>
 
-COPY scripts/create_testenv.sh /tmp/create_testenv.sh
-COPY setup.py $HOME/setup.py
-COPY requirements.txt $HOME/requirements.txt
-COPY requirements-dev.txt $HOME/requirements-dev.txt
-RUN /bin/bash /tmp/create_testenv.sh --global --no-setup
+ADD $SRC_DIR /home/jovyan/
+RUN /bin/bash /home/jovyan/scripts/create_testenv.sh --global --no-setup
 
 #  matplotlib nonsense
 ENV XDG_CACHE_HOME /home/$NB_USER/.cache/
@@ -26,4 +15,4 @@ RUN pip install seaborn
 # Import matplotlib the first time to build the font cache.
 RUN python -c "import matplotlib.pyplot"
 
-ENV PYTHONPATH $PYTHONPATH:"$HOME"/pymc3
+ENV PYTHONPATH $PYTHONPATH:"$HOME"

scripts/start_container.sh

@@ -5,10 +5,16 @@ SRC_DIR=${SRC_DIR:-`pwd`}
 NOTEBOOK_DIR=${NOTEBOOK_DIR:-$SRC_DIR/notebooks}
 TOKEN=$(openssl rand -hex 24)
 
-docker build -t pymc3 -f $SRC_DIR/scripts/Dockerfile $SRC_DIR
+# note that all paths are relative to the build context, so . represents
+# SRC_DIR to Docker
+docker build \
+    -t pymc3 \
+    -f $SRC_DIR/scripts/Dockerfile \
+    --build-arg SRC_DIR=. \
+    $SRC_DIR
+
 docker run -d \
     -p $PORT:8888 \
-    -v $SRC_DIR:/home/jovyan/pymc3 \
     -v $NOTEBOOK_DIR:/home/jovyan/work/ \
     --name pymc3 pymc3 \
     start-notebook.sh --NotebookApp.token=${TOKEN}