mirror of
https://github.com/jupyter/docker-stacks.git
synced 2025-10-15 14:02:58 +00:00
Make subimages compatible with late user creation
* Always remain as root during install * Put kernel specs in system path, not user home * Create user work directory at startup * Note this is in 4.0 and up images, not 3.2 Contribution (c) Copyright IBM Corp. 2015
This commit is contained in:
@@ -3,8 +3,6 @@ FROM jupyter/minimal-notebook
|
||||
|
||||
MAINTAINER Jupyter Project <jupyter@googlegroups.com>
|
||||
|
||||
USER root
|
||||
|
||||
# Spark dependencies
|
||||
ENV APACHE_SPARK_VERSION 1.4.1
|
||||
RUN apt-get -y update && \
|
||||
@@ -43,8 +41,6 @@ RUN cd /tmp && \
|
||||
apt-get remove -y sbt && \
|
||||
apt-get clean
|
||||
|
||||
USER jovyan
|
||||
|
||||
# Spark and Mesos pointers
|
||||
ENV SPARK_HOME /usr/local/spark
|
||||
ENV R_LIBS_USER $SPARK_HOME/R/lib
|
||||
@@ -74,7 +70,7 @@ RUN conda create -p $CONDA_DIR/envs/python2 python=2.7 \
|
||||
&& conda clean -yt
|
||||
RUN $CONDA_DIR/envs/python2/bin/python \
|
||||
$CONDA_DIR/envs/python2/bin/ipython \
|
||||
kernelspec install-self --user
|
||||
kernelspec install-self
|
||||
|
||||
# R packages
|
||||
RUN conda config --add channels r
|
||||
@@ -85,9 +81,5 @@ RUN conda install --yes \
|
||||
'r-rcurl=1.95*' && conda clean -yt
|
||||
|
||||
# Scala Spark kernel spec
|
||||
RUN mkdir -p $HOME/.ipython/kernels/scala
|
||||
COPY kernel.json $HOME/.ipython/kernels/scala/
|
||||
|
||||
# Switch back to root so that supervisord runs under that user
|
||||
USER root
|
||||
RUN chown -R $NB_USER:$NB_USER $HOME/.ipython/kernels/scala/
|
||||
RUN mkdir -p /usr/local/share/jupyter/kernels/scala
|
||||
COPY kernel.json /usr/local/share/jupyter/kernels/scala/
|
||||
|
Reference in New Issue
Block a user