arthur/handson-ml3
1
0
Fork 0
mirror of https://github.com/ArthurDanjou/handson-ml3.git synced 2026-01-25 01:10:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Jupyter switched to token authentication by default, enabled nbdime integration in git diff

Browse Source
This commit is contained in:
ziembla
2017-11-29 16:20:07 +01:00
parent 93623e8cc2
commit 7093626bc2
2 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
docker/Dockerfile
View File

@@ -15,9 +15,9 @@ RUN conda install -y -c conda-forge \
ARG username
ARG userid
RUN adduser ${username} --uid ${userid} --gecos '' --disabled-password && \
echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} && \
chmod 0440 /etc/sudoers.d/${username}
RUN adduser ${username} --uid ${userid} --gecos '' --disabled-password \
&& echo "${username} ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/${username} \
&& chmod 0440 /etc/sudoers.d/${username}
ENV HOME /home/${username}
@@ -30,29 +30,41 @@ RUN jupyter contrib nbextension install --user
RUN jupyter nbextension enable toc2/main
# INFO: Have RUN command below uncommented to for easy and constant URL (just localhost:8888)
# (by setting empty password instead of using a token)
# To avoid making a security hole the best would be to regenerate a hash for
# your own non-empty password and to replace the hash below.
# You can compute a password hash in the notebook, just run the code:
# INFO: Uncomment the RUN command below for easy and constant notebook URL (just localhost:8888)
# That will switch jupyter to using empty password instead of a token.
# To avoid making a security hole you SHOULD in fact not only uncomment but
# regenerate the hash for your own non-empty password and replace the hash below.
# You can compute a password hash in any notebook, just run the code:
# from notebook.auth import passwd
# passwd()
RUN mkdir -p ${HOME}/.jupyter && \
echo 'c.NotebookApp.password = u"sha1:c6bbcba2d04b:f969e403db876dcfbe26f47affe41909bd53392e"' \
>> ${HOME}/.jupyter/jupyter_notebook_config.py
# and take the hash from the output
#RUN mkdir -p ${HOME}/.jupyter && \
# echo 'c.NotebookApp.password = u"sha1:c6bbcba2d04b:f969e403db876dcfbe26f47affe41909bd53392e"' \
# >> ${HOME}/.jupyter/jupyter_notebook_config.py
# INFO: Uncomment the RUN command below to disable git diff paging
#RUN git config --global core.pager ''
# INFO: Below - work in progress, nbdime not totally integrated, still it enables diffing
# notebooks via nbdiff after connecting to container by "make exec" (docker exec)
# Use:
# notebooks with nbdiff (and nbdiff support in git diff command) after connecting to
# the container by "make exec" (docker exec)
# Try:
# nbd NOTEBOOK_NAME.ipynb
# to get nbdiff between checkpointed version and current version of the given notebook
USER root
WORKDIR /
RUN conda install -y -c conda-forge nbdime
USER ${username}
WORKDIR ${HOME}/handson-ml
RUN git-nbdiffdriver config --enable --global
# INFO: Uncomment the RUN command below to ignore metadata in nbdiff within git diff
#RUN git config --global diff.jupyternotebook.command 'git-nbdiffdriver diff --ignore-metadata'
COPY docker/bashrc /tmp/bashrc
RUN cat /tmp/bashrc >> ${HOME}/.bashrc