Merge pull request #294 from parente/fix-nbuid-regression

Fix #269, NB_UID regression

all-spark-notebook/Dockerfile

@@ -24,7 +24,7 @@ USER $NB_USER
 RUN conda config --add channels r && \
     conda install --quiet --yes \
     'r-base=3.3.1 1' \
-    'r-irkernel=0.6*' \
+    'r-irkernel=0.7*' \
     'r-ggplot2=2.1*' \
     'r-rcurl=1.95*' && conda clean -tipsy
 

base-notebook/Dockerfile

@@ -53,7 +53,6 @@ USER $NB_USER
 # Setup jovyan home directory
 RUN mkdir /home/$NB_USER/work && \
     mkdir /home/$NB_USER/.jupyter && \
-    mkdir -p -m 700 /home/$NB_USER/.local/share/jupyter && \
     echo "cacert=/etc/ssl/certs/ca-certificates.crt" > /home/$NB_USER/.curlrc
 
 # Install conda as jovyan

datascience-notebook/Dockerfile

@@ -29,7 +29,7 @@ RUN conda config --add channels r && \
     conda install --quiet --yes \
     'rpy2=2.8*' \
     'r-base=3.3.1 1' \
-    'r-irkernel=0.6*' \
+    'r-irkernel=0.7*' \
     'r-plyr=1.8*' \
     'r-devtools=1.11*' \
     'r-dplyr=0.4*' \
@@ -50,8 +50,9 @@ RUN conda config --add channels r && \
 # to the system share location. Avoids problems with runtime UID change not
 # taking effect properly on the .local folder in the jovyan home dir.
 RUN julia -e 'Pkg.add("IJulia")' && \
-    mv /home/$NB_USER/.local/share/jupyter/kernels/julia* $CONDA_DIR/share/jupyter/kernels/ && \
-    chmod -R go+rx $CONDA_DIR/share/jupyter
+    mv $HOME/.local/share/jupyter/kernels/julia* $CONDA_DIR/share/jupyter/kernels/ && \
+    chmod -R go+rx $CONDA_DIR/share/jupyter && \
+    rm -rf $HOME/.local
 
 # Show Julia where conda libraries are
 # Add essential packages

r-notebook/Dockerfile

@@ -21,7 +21,7 @@ USER $NB_USER
 RUN conda config --add channels r && \
     conda install --quiet --yes \
     'r-base=3.3.1 1' \
-    'r-irkernel=0.6*' \
+    'r-irkernel=0.7*' \
     'r-plyr=1.8*' \
     'r-devtools=1.11*' \
     'r-dplyr=0.4*' \