Add Thetis back to Docker images (#4225)

* Add Thetis back to firedrake Docker image

* Reenable Thetis notebooks

* Add icepack back to firedrake container

Author: connorjward

docker/Dockerfile.firedrake

@@ -8,19 +8,16 @@ RUN pip install --verbose \
         jax ngsPETSc torch vtk
 
 # Install Firedrake apps
-# FIXME: Thetis and icepack use legacy installation methods and are not installable
-# (Thetis fixed in https://github.com/thetisproject/thetis/pull/392)
-# Once they are fixed the following lines can be added back in:
-# -e git+https://github.com/thetisproject/thetis.git#egg=thetis
-# -e git+https://github.com/icepack/icepack.git#egg=icepack
 RUN pip install --verbose --src /opt \
         -e git+https://github.com/firedrakeproject/asQ.git#egg=asQ \
         -e git+https://bitbucket.org/pefarrell/defcon.git#egg=defcon \
         -e git+https://bitbucket.org/pefarrell/fascd.git#egg=fascd \
         -e git+https://github.com/FEMlium/FEMlium.git#egg=FEMlium \
         -e git+https://github.com/g-adopt/g-adopt.git#egg=gadopt \
         -e git+https://github.com/firedrakeproject/gusto.git#egg=gusto \
-        -e git+https://github.com/firedrakeproject/Irksome.git#egg=Irksome
+        -e git+https://github.com/firedrakeproject/Irksome.git#egg=Irksome \
+        -e git+https://github.com/icepack/icepack.git#egg=icepack \
+        -e git+https://github.com/thetisproject/thetis.git#egg=thetis
 
 # Install some other niceties
 RUN apt-get update \

docker/Dockerfile.jupyter

@@ -14,12 +14,11 @@ RUN mkdir /opt/firedrake-notebooks \
     done
 
 # Now do the same for thetis.
-# FIXME: Add these back in once Thetis is in the firedrake container
-# RUN mkdir thetis-notebooks \
-#     && cp -r thetis/demos/* thetis-notebooks/ \
-#     && rm thetis-notebooks/*.py \
-#     && for file in thetis-notebooks/*.ipynb; do \
-#         jupyter nbconvert --ClearOutputPreprocessor.enabled=True --inplace $file; \
-#     done
+RUN mkdir /opt/thetis-notebooks \
+    && cp -r /opt/thetis/demos/* /opt/thetis-notebooks/ \
+    && rm /opt/thetis-notebooks/*.py \
+    && for file in /opt/thetis-notebooks/*.ipynb; do \
+        jupyter nbconvert --ClearOutputPreprocessor.enabled=True --inplace $file; \
+    done
 
 CMD ["jupyter", "nbclassic", "--ip", "0.0.0.0", "--no-browser", "--allow-root"]