Add user in script

minimal-notebook/Dockerfile

@@ -28,27 +28,18 @@ ENV CONDA_DIR /opt/conda
 ENV NB_USER jovyan
 
 # Install conda
-RUN echo 'export PATH=$CONDA_DIR/bin:$PATH' > /etc/profile.d/conda.sh && \
+RUN echo export PATH=$CONDA_DIR/bin:'$PATH' > /etc/profile.d/conda.sh && \
     wget --quiet https://repo.continuum.io/miniconda/Miniconda3-3.9.1-Linux-x86_64.sh && \
     /bin/bash /Miniconda3-3.9.1-Linux-x86_64.sh -b -p $CONDA_DIR && \
     rm Miniconda3-3.9.1-Linux-x86_64.sh && \
     $CONDA_DIR/bin/conda install --yes conda==3.14.1
 
-# Create non-root user
-RUN useradd -m -s /bin/bash $NB_USER
-RUN chown -R $NB_USER:$NB_USER $CONDA_DIR
-RUN chown $NB_USER:$NB_USER /home/$NB_USER -R
-
-# Configure user environment
-USER $NB_USER
-ENV HOME /home/$NB_USER
-ENV SHELL /bin/bash
-ENV USER $NB_USER
+# Configure docker environment
 ENV PATH $CONDA_DIR/bin:$PATH
 
 # Setup a work directory rooted in home for ease of volume mounting
-ENV WORK $HOME/work
-RUN mkdir -p $WORK
+ENV WORK /notebooks
+RUN mkdir -p $WORK && chown root.users $WORK && chmod g+w $WORK
 WORKDIR $WORK
 
 # Install Jupyter notebook
@@ -57,16 +48,11 @@ RUN conda install --yes \
     terminado \
     && conda clean -yt
 
-# Configure Jupyter
-RUN jupyter notebook --generate-config
-
 # Configure container startup
 EXPOSE 8888
-USER root
-CMD ["supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
+CMD [ "start-notebook.sh" ]
 
 # Add local files as late as possible to avoid cache busting
-COPY jupyter_notebook_config.py $HOME/.jupyter/
+COPY start-notebook.sh /usr/local/bin/
 COPY notebook.conf /etc/supervisor/conf.d/
-COPY enable_sudo.sh /usr/local/bin/
-RUN chown $NB_USER:$NB_USER $HOME/.jupyter/jupyter_notebook_config.py
+COPY jupyter_notebook_config.py /etc/skel/.jupyter/

minimal-notebook/README.md

@@ -21,6 +21,7 @@ You may customize the execution of the Docker container and the Notebook server
 
 * `-e PASSWORD="YOURPASS"` - Configures Jupyter Notebook to require the given password. Should be conbined with `USE_HTTPS` on untrusted networks.
 * `-e USE_HTTPS=yes` - Configures Jupyter Notebook to accept encrypted HTTPS connections. If a `pem` file containing a SSL certificate and key is not provided (see below), the container will generate a self-signed certificate for you.
+* `-e NB_UID=1000` - Specify the uid of the `jovyan` user. Useful to mount host volumes with specific file ownership.
 * `-e GRANT_SUDO=yes` - Gives the `jovyan` user passwordless `sudo` capability. Useful for installing OS packages. **You should only enable `sudo` if you trust the user or if the container is running on an isolated host.**
 * `-v /some/host/folder/for/work:/home/jovyan/work` - Host mounts the default working directory on the host to preserve work even when the container is destroyed and recreated (e.g., during an upgrade).
 * **(v3.2.x)** `-v /some/host/folder/for/server.pem:/home/jovyan/.ipython/profile_default/security/notebook.pem` - Mounts a SSL certificate plus key for `USE_HTTPS`. Useful if you have a real certificate for the domain under which you are running the Notebook server.

minimal-notebook/notebook.conf

@@ -1,18 +1,10 @@
 [program:notebook]
 user=jovyan
 umask=0002
-directory=/home/jovyan/work
+directory=%(ENV_WORK)s
 command=ipython notebook
 autostart=true
 autorestart=true
 stdout_logfile=/var/log/supervisor/%(program_name)s.log
 redirect_stderr=true
-
-[program:sudoers]
-command=enable_sudo.sh
-autostart=true
-autorestart=false
-stdout_logfile=/var/log/supervisor/%(program_name)s.log
-redirect_stderr=true
-startretries=0
-startsecs=0
+environment=HOME="/home/%(ENV_NB_USER)s",USER="%(ENV_NB_USER)s"

minimal-notebook/start-notebook.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Create non-root NB_USER, member of group "users"
+useradd -m -s /bin/bash -u ${NB_UID:-1000} -G users $NB_USER
+
+# Allow "users" group to update conda root env
+chown -R root.users $CONDA_DIR
+chmod -R g+w $CONDA_DIR
+
+# Enable sudo if requested
+if [ ! -z "$GRANT_SUDO" ]; then
+    echo "$NB_USER ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/notebook
+fi
+
+# Start supervisord in foreground, PID1
+exec supervisord -n -c /etc/supervisor/supervisord.conf