From 107de893049dea3afa26e432beb4158ceddf64ed Mon Sep 17 00:00:00 2001 From: ziembla Date: Fri, 1 Dec 2017 11:28:18 +0100 Subject: [PATCH] Nbdime patching ignored if the original file was changed --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e7efc36..a8fafa0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -53,14 +53,14 @@ RUN git-nbdiffdriver config --enable --global 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/ USER root WORKDIR / 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=- < \ - /tmp/nbdime-2-toc.patch + /tmp/nbdime-2-toc.patch || true RUN rm /tmp/nbdime-*.patch USER ${username} WORKDIR ${workdir}