Install NBDime

notebook/Dockerfile

@@ -80,6 +80,12 @@ RUN jupyter labextension update --all && \
     jupyterlab-plotly \
     plotlywidget
 
+# Also install NBDIME jupyterlab extension
+# https://nbdime.readthedocs.io/en/latest/extensions.html
+RUN nbdime extensions --enable && \
+    nbdime config-git --enable --system
+# This json sends web-based diff and merge tools to an IP that is accessible
+COPY nbdime_config.json /opt/conda/etc/jupyter
 
 ## clean up
 RUN sudo rm -rf /var/lib/apt/lists/* /tempdir

notebook/nbdime_config.json

@@ -0,0 +1,5 @@
+{
+    "WebTool": {
+        "ip": "*"
+    }
+}

notebook/notebook_environment.yml

@@ -11,6 +11,7 @@ dependencies:
   - ipympl=0.3.3=py_0
   - jupyterlab_code_formatter=0.7.0=py_0
   - nano=2.9.8=hb256ff8_1000
+  - nbdime=2.0.0
   - nb_conda_kernels=2.2.2=py37_0
   - nose=1.3.7=py37_1003
   - octave_kernel=0.31.0=py_0