update docker files for debian 12

add support for debian-12 bookworm #53
feelpp · Jul 8, 2023 · ba586c1 · ba586c1
1 parent e6d9b5f
commit ba586c1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/feelpp-env/Dockerfile-debian b/feelpp-env/Dockerfile-debian
@@ -1,6 +1,10 @@
+RUN sed -i 's/http:\/\/deb.debian.org\/ubuntu\//http:\/\/miroir.univ-lorraine.fr\/debian\//' /etc/apt/sources.list
+
 RUN apt-get -qq update && \
     apt-get -y --force-yes install \
-    software-properties-common gnupg
+    software-properties-common gnupg \
+    ca-certificates-java default-jre-headless \
+    quilt  debhelper dh-python 
 
 # RUN add-apt-repository ppa:ubuntu-toolchain-r/test
 
@@ -12,12 +16,10 @@ ENV TZ=Europe/Paris
 RUN apt-get -y install tzdata
 RUN apt-get -qq update && \
     apt-get -y --force-yes install \
-    quilt  debhelper \
     cmake \
     tree ne                                              \
     ssh git-lfs sudo \
     clang g++ \
-    dh-python \
     python3  python3-dev  python3-setuptools  python3-sympy python3-pytest python3-gmsh python3-plotly python3-sklearn-pandas python3-tqdm  python3-venv \
     chrpath \
     libboost-all-dev  \

diff --git a/feelpp-env/README.adoc b/feelpp-env/README.adoc
@@ -47,6 +47,11 @@ bash mkimg.sh  -f debian:10 -t feelpp/feelpp-env:debian-10 -c clang++-7 --
 docker build -t ghcr.io/feelpp/feelpp-env:debian-10 "debian-10-clang++-7"
 ----
 
+----
+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++"
+----
+
 == Fedora
 
 === Fedora 36

diff --git a/feelpp/Dockerfile b/feelpp/Dockerfile
@@ -11,6 +11,9 @@ ENV CHANNEL=${CHANNEL:-latest}
 RUN if test "$FLAVOR" = "ubuntu"; then \
         sed -i 's/http:\/\/archive.ubuntu.com\/ubuntu\//http:\/\/miroir.univ-lorraine.fr\/ubuntu\//' /etc/apt/sources.list; \
     fi
+RUN if test "$FLAVOR" = "debian"; then \
+        sed -i 's/http:\/\/deb.debian.org\/debian\//http:\/\/miroir.univ-lorraine.fr\/deb\//' /etc/apt/sources.list; \
+        fi
 RUN apt-get update \
         && apt-get install -y \
         vim \