mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-18 15:32:56 +00:00
Merge pull request #294 from parente/fix-nbuid-regression
Fix #269, NB_UID regression
This commit is contained in:
@@ -24,7 +24,7 @@ USER $NB_USER
|
|||||||
RUN conda config --add channels r && \
|
RUN conda config --add channels r && \
|
||||||
conda install --quiet --yes \
|
conda install --quiet --yes \
|
||||||
'r-base=3.3.1 1' \
|
'r-base=3.3.1 1' \
|
||||||
'r-irkernel=0.6*' \
|
'r-irkernel=0.7*' \
|
||||||
'r-ggplot2=2.1*' \
|
'r-ggplot2=2.1*' \
|
||||||
'r-rcurl=1.95*' && conda clean -tipsy
|
'r-rcurl=1.95*' && conda clean -tipsy
|
||||||
|
|
||||||
|
@@ -53,7 +53,6 @@ USER $NB_USER
|
|||||||
# Setup jovyan home directory
|
# Setup jovyan home directory
|
||||||
RUN mkdir /home/$NB_USER/work && \
|
RUN mkdir /home/$NB_USER/work && \
|
||||||
mkdir /home/$NB_USER/.jupyter && \
|
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
|
echo "cacert=/etc/ssl/certs/ca-certificates.crt" > /home/$NB_USER/.curlrc
|
||||||
|
|
||||||
# Install conda as jovyan
|
# Install conda as jovyan
|
||||||
|
@@ -29,7 +29,7 @@ RUN conda config --add channels r && \
|
|||||||
conda install --quiet --yes \
|
conda install --quiet --yes \
|
||||||
'rpy2=2.8*' \
|
'rpy2=2.8*' \
|
||||||
'r-base=3.3.1 1' \
|
'r-base=3.3.1 1' \
|
||||||
'r-irkernel=0.6*' \
|
'r-irkernel=0.7*' \
|
||||||
'r-plyr=1.8*' \
|
'r-plyr=1.8*' \
|
||||||
'r-devtools=1.11*' \
|
'r-devtools=1.11*' \
|
||||||
'r-dplyr=0.4*' \
|
'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
|
# to the system share location. Avoids problems with runtime UID change not
|
||||||
# taking effect properly on the .local folder in the jovyan home dir.
|
# taking effect properly on the .local folder in the jovyan home dir.
|
||||||
RUN julia -e 'Pkg.add("IJulia")' && \
|
RUN julia -e 'Pkg.add("IJulia")' && \
|
||||||
mv /home/$NB_USER/.local/share/jupyter/kernels/julia* $CONDA_DIR/share/jupyter/kernels/ && \
|
mv $HOME/.local/share/jupyter/kernels/julia* $CONDA_DIR/share/jupyter/kernels/ && \
|
||||||
chmod -R go+rx $CONDA_DIR/share/jupyter
|
chmod -R go+rx $CONDA_DIR/share/jupyter && \
|
||||||
|
rm -rf $HOME/.local
|
||||||
|
|
||||||
# Show Julia where conda libraries are
|
# Show Julia where conda libraries are
|
||||||
# Add essential packages
|
# Add essential packages
|
||||||
|
@@ -21,7 +21,7 @@ USER $NB_USER
|
|||||||
RUN conda config --add channels r && \
|
RUN conda config --add channels r && \
|
||||||
conda install --quiet --yes \
|
conda install --quiet --yes \
|
||||||
'r-base=3.3.1 1' \
|
'r-base=3.3.1 1' \
|
||||||
'r-irkernel=0.6*' \
|
'r-irkernel=0.7*' \
|
||||||
'r-plyr=1.8*' \
|
'r-plyr=1.8*' \
|
||||||
'r-devtools=1.11*' \
|
'r-devtools=1.11*' \
|
||||||
'r-dplyr=0.4*' \
|
'r-dplyr=0.4*' \
|
||||||
|
Reference in New Issue
Block a user