Merge pull request #3615 from FStarLang/_taramana_ci

CI: switch Dockerfiles back to Ubuntu 22.04 LTS
FStarLang · Nov 20, 2024 · 0d1bb7c · 0d1bb7c
2 parents 668e459 + 8d8149f
commit 0d1bb7c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.devcontainer/minimal.Dockerfile b/.devcontainer/minimal.Dockerfile
@@ -1,4 +1,5 @@
-FROM ubuntu:23.10
+# FIXME: z3.4.8.5-1 can no longer be installed on Ubuntu 24.04 because python3-distutils disappeared, and the z3 opam package has not been fixed for version 4.8.5, and 23.10 and all prior non-LTS are now EOL. Reverting to the previous LTS
+FROM ubuntu:22.04
 
 SHELL ["/bin/bash", "-c"]
 

diff --git a/.docker/base.Dockerfile b/.docker/base.Dockerfile
@@ -8,9 +8,8 @@
 # and it is copied into the home directory on the image. CI jobs
 # will NOT use this file.
 
-# We always try to build against the most current ubuntu image.
-# FIXME: Broken with 24.04, fixing it to 23.10 so we can keep working
-FROM ubuntu:23.10
+# FIXME: z3.4.8.5-1 can no longer be installed on Ubuntu 24.04 because python3-distutils disappeared, and the z3 opam package has not been fixed for version 4.8.5, and 23.10 and all prior non-LTS are now EOL. Reverting to the previous LTS
+FROM ubuntu:22.04
 
 RUN apt-get update
 

diff --git a/.docker/nu_base.Dockerfile b/.docker/nu_base.Dockerfile
@@ -1,6 +1,7 @@
 # For check-world workflow, should be coallesced to the other base.
 # This could definitely use a big cleanup too.
-FROM ubuntu:23.10
+# FIXME: z3.4.8.5-1 can no longer be installed on Ubuntu 24.04 because python3-distutils disappeared, and the z3 opam package has not been fixed for version 4.8.5, and 23.10 and all prior non-LTS are now EOL. Reverting to the previous LTS
+FROM ubuntu:22.04
 
 RUN apt-get update