Update dockerfiles for Ubuntu 24 and allow workflow_dispatch

Author: Ben Fulton

.github/workflows/ubuntu.yml

@@ -5,6 +5,7 @@ permissions:
   contents: read
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - pablo_dev3
@@ -18,6 +19,7 @@ on:
       - meissam_dev_new
       - hayley_dev
       - ruixiao_dev_new
+      - master_ubuntu24
 
 jobs:
 
@@ -36,6 +38,9 @@ jobs:
 
           - name: "Build Focal"
             release: focal
+
+          - name: "Build Noble"
+            release: noble  
     steps:
 
       - name: Check Out Repo
@@ -81,6 +86,11 @@ jobs:
             command: "make THREADS=1 serialtest-mp-xml"
             output: "multiphase_test_results.xml"
 
+          - name: "Noble"
+            release: noble
+            runner: ubuntu-latest
+            command: "make THREADS=1 serialtest-mp-xml"
+            output: "multiphase_test_results.xml"
     steps:
 
       - name: Run tests (${{ matrix.name }})
@@ -112,12 +122,14 @@ jobs:
 
     strategy:
       matrix:
-        name: [ "Report Bionic", "Report Focal" ]
+        name: [ "Report Bionic", "Report Focal", "Report Noble" ]
         include:
           - name: "Report Bionic"
             release: bionic
           - name: "Report Focal"
             release: focal
+          - name: "Report Noble"
+            release: noble
 
     steps:
       - uses: actions/download-artifact@v4

docker/Dockerfile.noble

@@ -2,9 +2,10 @@
 
 # Use a Noble base image
 FROM ubuntu:noble
+RUN userdel -r ubuntu
 
 # This DockerFile is looked after by
-MAINTAINER Tim Greaves
+LABEL MAINTAINER="Tim Greaves"
 
 # Installs shouldn't expect input
 ENV DEBIAN_FRONTEND=noninteractive
@@ -18,20 +19,26 @@ RUN apt-get update && \
      gpg --export --armor 33BAC3BE | apt-key add - && \
      apt-get update && \
      echo "Europe/London" > /etc/timezone && \
-     apt-get -y install fluidity-dev texlive-pstricks texlive texlive-latex-extra texlive-science python3-pip && \
+     apt-get -y install fluidity-dev texlive-pstricks texlive texlive-latex-extra texlive-science \
+     python3-pip python3-numpy python3.12-venv libvtk9-dev libparmetis-dev gir1.2-gtksource-3.0 libnetcdff-dev && \
      rm -rf /var/cache/apt && \
      rm -rf /var/lib/apt/lists
 
-RUN python3 -m pip install --upgrade junit-xml
 
 WORKDIR /usr/local
 RUN curl -fsL https://gmsh.info/bin/Linux/gmsh-4.8.3-Linux64.tgz | tar --strip-components=1 -zxf -
-
-ENV PETSC_DIR /usr/lib/petscdir/3.19
-ENV LDFLAGS -L/usr/lib/x86_64-linux-gnu/hdf5/openmpi
-ENV CPPFLAGS -I/usr/include/hdf5/openmpi
-ENV OMPI_MCA_btl_vader_single_copy_mechanism none
-ENV OMPI_MCA_rmaps_base_oversubscribe 1
+RUN curl -LO https://github.com/sandialabs/Zoltan/archive/refs/tags/v3.83.tar.gz && \
+    tar -zxf v3.83.tar.gz && rm v3.83.tar.gz && \
+    cd Zoltan-3.83 && mkdir build && cd build && \
+    ../configure --prefix=/usr/local/zoltan --with-parmetis --with-parmetis-libdir=default --enable-mpi --with-mpi-compilers --enable-f90interface --with-fcflags="-fallow-argument-mismatch" && \
+    make everything && make install
+
+ENV PETSC_DIR=/usr/lib/petscdir/3.19
+ENV LDFLAGS=-L/usr/lib/x86_64-linux-gnu/hdf5/openmpi
+ENV CPPFLAGS=-I/usr/include/hdf5/openmpi
+ENV OMPI_MCA_btl_vader_single_copy_mechanism=none
+ENV OMPI_MCA_rmaps_base_oversubscribe=1
+ENV FCFLAGS="-I/usr/local/zoltan/include -L/usr/local/zoltan/lib"
 
 # Add a Fluidity user who will be the default user for this container
 # Make sure the user has a userid matching the host system
@@ -41,3 +48,10 @@ RUN adduser --disabled-password --gecos "" -u $userid fluidity
 
 USER fluidity
 WORKDIR /home/fluidity
+
+# Create a virtual environment
+RUN python3 -m venv python_venv
+
+# Install packages using the venv's pip
+RUN python_venv/bin/pip install --upgrade pip
+RUN python_venv/bin/pip install junit-xml

docker/actions/Dockerfile.actions.noble

@@ -1,4 +1,4 @@
-FROM fluidity/baseimages:noble
+FROM benfulton/icferst:noble
 
 USER root
 
@@ -12,8 +12,10 @@ RUN chown -R fluidity /home/fluidity
 
 USER fluidity
 
-ENV FCFLAGS="-I/usr/include"
+ENV FCFLAGS="-I/usr/local/zoltan/include -L/usr/local/zoltan/lib"
 
-RUN ./configure --enable-2d-adaptivity
-RUN make mp
-RUN make fltools
+RUN ./configure2 --enable-2d-adaptivity
+RUN cp libjudy/libtool libspud
+RUN make -j8 mp
+
+# RUN make fltools