use boost 1.83-dev on 24.04

up README #56
feelpp · Dec 28, 2023 · 28f4149 · 28f4149 · prudhomm · Dec 29, 2023
1 parent 82cd03e
commit 28f4149
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/feelpp-env/Dockerfile-ubuntu-24.04 b/feelpp-env/Dockerfile-ubuntu-24.04
@@ -1 +1,6 @@
-
+RUN apt-get -qq update && \
+  apt-get -yq install \
+    libboost1.83-all-dev \
+  && apt-get -y autoremove \
+  && apt-get -y clean \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
diff --git a/feelpp-env/README.adoc b/feelpp-env/README.adoc
@@ -31,11 +31,11 @@ bash mkimg.sh  -f ubuntu:22.04 -t ghcr.io/feelpp/feelpp-env:ubuntu-22.04 --
 docker build -t ghcr.io/feelpp/feelpp-env:ubuntu-22.04 "ubuntu-22.04-clang++"
 ----
 
-=== Kinetic
+=== Noble
 
 ----
-bash mkimg.sh  -f ubuntu:22.10 -t ghcr.io/feelpp/feelpp-env:ubuntu-22.10 --
-docker build -t ghcr.io/feelpp/feelpp-env:ubuntu-22.10 "ubuntu-22.10-clang++"
+bash mkimg.sh  -f ubuntu:24.04 -t ghcr.io/feelpp/feelpp-env:ubuntu-24.04 --
+docker build -t ghcr.io/feelpp/feelpp-env:ubuntu-24.04 "ubuntu-24.04-clang++"
 ----
 
 == Debian
@@ -52,6 +52,11 @@ bash mkimg.sh  -f debian:12 -t feelpp/feelpp-env:debian-12  --
 docker build -t ghcr.io/feelpp/feelpp-env:debian-12 "debian-12-clang++"
 ----
 
+----
+bash mkimg.sh  -f debian:sid -t feelpp/feelpp-env:debian-sid  --
+docker build -t ghcr.io/feelpp/feelpp-env:debian-sid "debian-sid-clang++"
+----
+
 == Fedora
 
 === Fedora 36

diff --git a/feelpp-env/mkimg.sh b/feelpp-env/mkimg.sh
@@ -71,7 +71,7 @@ if test -f Dockerfile-$fromos-$fromtag; then
     ( cat "Dockerfile-$fromos-$fromtag"; echo ) >> "$dir/Dockerfile"
 fi
 
-if test $fromos != "fedora"; then
+if test $fromos != "fedora" -a $fromtag != "24.04"; then
     if test -f Dockerfile-deb-om-$fromos-$fromtag; then
         ( cat "Dockerfile-deb-om-$fromos-$fromtag"; echo )  >> "$dir/Dockerfile"
     else