From fdb247ec0ce859cdf356851966a2ff775a13ec22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= <seb@wirrsal.net>
Date: Tue, 28 Jun 2016 11:15:24 +0200
Subject: [PATCH] Make use of available environment variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

base-notebook defines environment variables for the Conda install path and the
notebook user. However, in some instances, these locations were still hardcoded.
Let’s use the variables instead.
---
 all-spark-notebook/Dockerfile   | 2 +-
 base-notebook/Dockerfile        | 8 ++++----
 datascience-notebook/Dockerfile | 4 ++--
 minimal-notebook/Dockerfile     | 2 +-
 pyspark-notebook/Dockerfile     | 2 +-
 r-notebook/Dockerfile           | 2 +-
 scipy-notebook/Dockerfile       | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/all-spark-notebook/Dockerfile b/all-spark-notebook/Dockerfile
index 46e11e15..38da11c0 100644
--- a/all-spark-notebook/Dockerfile
+++ b/all-spark-notebook/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get update && \
     gcc && apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-USER jovyan
+USER $NB_USER
 
 # R packages
 RUN conda config --add channels r && \
diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile
index f8b5aa1d..c947e74c 100644
--- a/base-notebook/Dockerfile
+++ b/base-notebook/Dockerfile
@@ -42,10 +42,10 @@ ENV LANGUAGE en_US.UTF-8
 
 # Create jovyan user with UID=1000 and in the 'users' group
 RUN useradd -m -s /bin/bash -N -u $NB_UID $NB_USER && \
-    mkdir -p /opt/conda && \
-    chown jovyan /opt/conda
+    mkdir -p $CONDA_DIR && \
+    chown $NB_USER $CONDA_DIR
 
-USER jovyan
+USER $NB_USER
 
 # Setup jovyan home directory
 RUN mkdir /home/$NB_USER/work && \
@@ -87,4 +87,4 @@ COPY jupyter_notebook_config.py /home/$NB_USER/.jupyter/
 RUN chown -R $NB_USER:users /home/$NB_USER/.jupyter
 
 # Switch back to jovyan to avoid accidental container runs as root
-USER jovyan
+USER $NB_USER
diff --git a/datascience-notebook/Dockerfile b/datascience-notebook/Dockerfile
index f2b81237..b1dd7692 100644
--- a/datascience-notebook/Dockerfile
+++ b/datascience-notebook/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && \
     libnettle4 && apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-USER jovyan
+USER $NB_USER
 
 # R packages including IRKernel which gets installed globally.
 RUN conda config --add channels r && \
@@ -55,5 +55,5 @@ RUN julia -e 'Pkg.add("IJulia")' && \
 
 # Show Julia where conda libraries are
 # Add essential packages
-RUN echo 'push!(Sys.DL_LOAD_PATH, "/opt/conda/lib")' > /home/$NB_USER/.juliarc.jl && \
+RUN echo "push!(Sys.DL_LOAD_PATH, \"$CONDA_DIR/lib\")" > /home/$NB_USER/.juliarc.jl && \
     julia -e 'Pkg.add("Gadfly")' && julia -e 'Pkg.add("RDatasets")' && julia -F -e 'Pkg.add("HDF5")'
diff --git a/minimal-notebook/Dockerfile b/minimal-notebook/Dockerfile
index aeac05fd..d9a05d21 100644
--- a/minimal-notebook/Dockerfile
+++ b/minimal-notebook/Dockerfile
@@ -28,4 +28,4 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
     rm -rf /var/lib/apt/lists/*
 
 # Switch back to jovyan to avoid accidental container runs as root
-USER jovyan
+USER $NB_USER
diff --git a/pyspark-notebook/Dockerfile b/pyspark-notebook/Dockerfile
index 4153ab35..b508e99d 100644
--- a/pyspark-notebook/Dockerfile
+++ b/pyspark-notebook/Dockerfile
@@ -39,7 +39,7 @@ ENV PYTHONPATH $SPARK_HOME/python:$SPARK_HOME/python/lib/py4j-0.9-src.zip
 ENV MESOS_NATIVE_LIBRARY /usr/local/lib/libmesos.so
 ENV SPARK_OPTS --driver-java-options=-Xms1024M --driver-java-options=-Xmx4096M --driver-java-options=-Dlog4j.logLevel=info
 
-USER jovyan
+USER $NB_USER
 
 # Install Python 3 packages
 RUN conda install --quiet --yes \
diff --git a/r-notebook/Dockerfile b/r-notebook/Dockerfile
index 262e6865..18cf262a 100644
--- a/r-notebook/Dockerfile
+++ b/r-notebook/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && \
     gcc && apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-USER jovyan
+USER $NB_USER
 
 # R packages
 RUN conda config --add channels r && \
diff --git a/scipy-notebook/Dockerfile b/scipy-notebook/Dockerfile
index f8be0803..7324aefd 100644
--- a/scipy-notebook/Dockerfile
+++ b/scipy-notebook/Dockerfile
@@ -12,7 +12,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-USER jovyan
+USER $NB_USER
 
 # Install Python 3 packages
 RUN conda install --quiet --yes \
@@ -69,4 +69,4 @@ USER root
 # switching at runtime.
 RUN $CONDA_DIR/envs/python2/bin/python -m ipykernel install
 
-USER jovyan
+USER $NB_USER