Merge pull request #156 from project-everest/_nik_misc_fixes

Update documentation
project-everest · Nov 22, 2024 · f89dd55 · f89dd55
2 parents 3dd89a5 + db9aca9
commit f89dd55
Show file tree

Hide file tree

Showing 21 changed files with 1,721 additions and 84 deletions.
diff --git a/.docker/hierarchic.Dockerfile b/.docker/hierarchic.Dockerfile
@@ -16,7 +16,7 @@ RUN sudo apt-get update && eval $(opam env) && .docker/build/install-other-deps.
 # jinja2==3.0.0 because of https://github.com/mkdocs/mkdocs/issues/2799
 # alabaster==0.7.13 because of https://alabaster.readthedocs.io/en/latest/changelog.html (0.7.14 breaks old Sphinx versions.)
 RUN sudo apt-get install --yes --no-install-recommends python3-pip python3-setuptools python3-distutils
-RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme
+RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme || sudo pip3 install pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme
 
 # CI proper
 ARG CI_THREADS=24

diff --git a/.docker/standalone.Dockerfile b/.docker/standalone.Dockerfile
@@ -1,7 +1,7 @@
 # This Dockerfile should be run from the root EverParse directory
 
 ARG ocaml_version=4.14
-FROM ocaml/opam:ubuntu-23.10-ocaml-$ocaml_version
+FROM ocaml/opam:ubuntu-22.04-ocaml-$ocaml_version
 
 ADD --chown=opam:opam ./ $HOME/everparse/
 WORKDIR $HOME/everparse
@@ -23,7 +23,7 @@ RUN eval $(opam env) && .docker/build/install-deps.sh
 # jinja2==3.0.0 because of https://github.com/mkdocs/mkdocs/issues/2799
 # alabaster==0.7.13 because of https://alabaster.readthedocs.io/en/latest/changelog.html (0.7.14 breaks old Sphinx versions.)
 RUN sudo apt-get install --yes --no-install-recommends python3-pip python3-setuptools python3-distutils
-RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme
+RUN sudo pip3 install --break-system-packages pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme || sudo pip3 install pytz tzdata sphinx==1.7.2 jinja2==3.0.0 alabaster==0.7.13 sphinx_rtd_theme
 
 # CI proper
 ARG CI_THREADS=24