diff --git a/docker/Dockerfile-fedora b/docker/Dockerfile-fedora index 784f2d1..51138b6 100644 --- a/docker/Dockerfile-fedora +++ b/docker/Dockerfile-fedora @@ -1,4 +1,4 @@ -FROM fedora:43 AS image_base +FROM fedora:44 AS image_base RUN dnf -y install \ blas-devel \ boost-devel \ diff --git a/docker/Dockerfile-ubuntu-wo-dependencies b/docker/Dockerfile-ubuntu-wo-dependencies index f68c1c1..dedbb9d 100644 --- a/docker/Dockerfile-ubuntu-wo-dependencies +++ b/docker/Dockerfile-ubuntu-wo-dependencies @@ -1,5 +1,6 @@ -FROM ubuntu:noble AS image_base +FROM ubuntu:resolute AS image_base RUN apt-get update && \ + echo "path-include=/usr/share/doc/libprrte-dev/*" >> /etc/dpkg/dpkg.cfg.d/excludes && \ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \ apt-utils \ build-essential \ @@ -8,14 +9,16 @@ RUN apt-get update && \ ccache \ cmake \ cython3 \ - gcc-13 g++-13 libstdc++-13-dev \ + gcc-16 g++-16 libstdc++-16-dev \ gdb \ git \ + gzip \ libboost-dev \ libboost-mpi-dev \ libboost-serialization-dev \ libboost-test-dev \ libopenmpi-dev \ + libprrte-dev \ ninja-build \ openssh-client \ openmpi-bin \ @@ -30,6 +33,13 @@ RUN apt-get update && \ python3-setuptools \ python3-vtk9 \ vim && \ + if [ ! -f /usr/lib/x86_64-linux-gnu/prrte3/share/prte/help-prun.txt ]; then \ + # fix a packaging issue: https://bugs.launchpad.net/ubuntu/+source/openmpi/+bug/2155666 + mkdir -p /usr/lib/x86_64-linux-gnu/prrte3/share/prte && \ + cp /usr/share/doc/libprrte-dev/help-schizo-ompi.txt /usr/lib/x86_64-linux-gnu/prrte3/share/prte/ && \ + cp /usr/share/doc/libprrte-dev/help-prun.txt.gz /usr/lib/x86_64-linux-gnu/prrte3/share/prte/ && \ + gzip -d /usr/lib/x86_64-linux-gnu/prrte3/share/prte/help-prun.txt.gz ; \ + fi && \ apt-get clean && \ rm -rf /var/lib/apt/lists/*