schuetoliver
/
handson-ml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Nbdime patching ignored if the original file was changed

main
ziembla 2017-12-01 11:28:18 +01:00
parent e0b519c0a6
commit 107de89304
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/Dockerfile
View File

@ -53,14 +53,14 @@ RUN git-nbdiffdriver config --enable --global
RUN git config --global diff.jupyternotebook.command 'git-nbdiffdriver diff --ignore-details' RUN git config --global diff.jupyternotebook.command 'git-nbdiffdriver diff --ignore-details'
# INFO: Dirty nbdime patching # INFO: Dirty nbdime patching (ignored if not matching)
COPY docker/nbdime-*.patch /tmp/ COPY docker/nbdime-*.patch /tmp/
USER root USER root
WORKDIR / WORKDIR /
RUN patch -d /opt/conda/lib/python3.6/site-packages -p1 --forward --reject-file=- < \ RUN patch -d /opt/conda/lib/python3.6/site-packages -p1 --forward --reject-file=- < \
/tmp/nbdime-1-details.patch \ /tmp/nbdime-2-toc.patch || true \
&& patch -d /opt/conda/lib/python3.6/site-packages -p1 --forward --reject-file=- < \ && patch -d /opt/conda/lib/python3.6/site-packages -p1 --forward --reject-file=- < \
/tmp/nbdime-2-toc.patch /tmp/nbdime-2-toc.patch || true
RUN rm /tmp/nbdime-*.patch RUN rm /tmp/nbdime-*.patch
USER ${username} USER ${username}
WORKDIR ${workdir} WORKDIR ${workdir}