Add Noble and Oracular

Dockerfile.in

@@ -47,12 +47,14 @@ RUN \
 # GCC repo
 
 RUN \
-  add-apt-repository ppa:ubuntu-toolchain-r/test
+  if [ "@DISTRIB_CODENAME@" = "focal" ] ; then \
+    add-apt-repository ppa:ubuntu-toolchain-r/test ; \
+  fi
 
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update -y && \
-  if grep -q LTS /etc/lsb-release ; then \
+  if [ "@DISTRIB_CODENAME@" = "focal" ] ; then \
     apt-get install -y gcc-11 g++-11 && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
       --slave /usr/bin/g++ g++ /usr/bin/g++-11 \

focal/Dockerfile

@@ -51,12 +51,14 @@ RUN \
 # GCC repo
 
 RUN \
-  add-apt-repository ppa:ubuntu-toolchain-r/test
+  if [ "focal" = "focal" ] ; then \
+    add-apt-repository ppa:ubuntu-toolchain-r/test ; \
+  fi
 
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update -y && \
-  if grep -q LTS /etc/lsb-release ; then \
+  if [ "focal" = "focal" ] ; then \
     apt-get install -y gcc-11 g++-11 && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
       --slave /usr/bin/g++ g++ /usr/bin/g++-11 \

jammy/Dockerfile

@@ -51,12 +51,14 @@ RUN \
 # GCC repo
 
 RUN \
-  add-apt-repository ppa:ubuntu-toolchain-r/test
+  if [ "jammy" = "focal" ] ; then \
+    add-apt-repository ppa:ubuntu-toolchain-r/test ; \
+  fi
 
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update -y && \
-  if grep -q LTS /etc/lsb-release ; then \
+  if [ "jammy" = "focal" ] ; then \
     apt-get install -y gcc-11 g++-11 && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
       --slave /usr/bin/g++ g++ /usr/bin/g++-11 \

mantic/Dockerfile

@@ -51,12 +51,14 @@ RUN \
 # GCC repo
 
 RUN \
-  add-apt-repository ppa:ubuntu-toolchain-r/test
+  if [ "mantic" = "focal" ] ; then \
+    add-apt-repository ppa:ubuntu-toolchain-r/test ; \
+  fi
 
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update -y && \
-  if grep -q LTS /etc/lsb-release ; then \
+  if [ "mantic" = "focal" ] ; then \
     apt-get install -y gcc-11 g++-11 && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
       --slave /usr/bin/g++ g++ /usr/bin/g++-11 \

lunar/Dockerfile → noble/Dockerfile

@@ -2,7 +2,7 @@
 # This file is generated from Dockerfile.in. Do not edit!
 #
 
-FROM ubuntu:lunar
+FROM ubuntu:noble
 
 MAINTAINER [email protected]
 
@@ -38,8 +38,8 @@ RUN \
     gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware-archive-keyring.gpg
 
 RUN \
-  if [ "lunar" = "focal" ] ; then \
-    echo 'deb https://apt.kitware.com/ubuntu/ lunar main' > /etc/apt/sources.list.d/kitware.list ; \
+  if [ "noble" = "focal" ] ; then \
+    echo 'deb https://apt.kitware.com/ubuntu/ noble main' > /etc/apt/sources.list.d/kitware.list ; \
   fi
 
 RUN \
@@ -51,12 +51,14 @@ RUN \
 # GCC repo
 
 RUN \
-  add-apt-repository ppa:ubuntu-toolchain-r/test
+  if [ "noble" = "focal" ] ; then \
+    add-apt-repository ppa:ubuntu-toolchain-r/test ; \
+  fi
 
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update -y && \
-  if grep -q LTS /etc/lsb-release ; then \
+  if [ "noble" = "focal" ] ; then \
     apt-get install -y gcc-11 g++-11 && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
       --slave /usr/bin/g++ g++ /usr/bin/g++-11 \
@@ -72,14 +74,14 @@ RUN \
     gpg --dearmor - > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg
 
 RUN \
-  if [ "lunar" = "focal" ] ; then \
-    echo 'deb http://apt.llvm.org/lunar/ llvm-toolchain-lunar-11 main' > /etc/apt/sources.list.d/llvm.list ; \
+  if [ "noble" = "focal" ] ; then \
+    echo 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-11 main' > /etc/apt/sources.list.d/llvm.list ; \
   fi
 
 RUN \
   export DEBIAN_FRONTEND=noninteractive && \
   apt-get update -y && \
-  if [ "lunar" = "focal" ] ; then \
+  if [ "noble" = "focal" ] ; then \
     apt-get install -y \
       clang++-11 \
       clang-11 && \

oracular/Dockerfile

@@ -0,0 +1,99 @@
+#
+# This file is generated from Dockerfile.in. Do not edit!
+#
+
+FROM ubuntu:oracular
+
+MAINTAINER [email protected]
+
+RUN \
+  export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update -y && \
+  apt-get install -y \
+    git \
+    gpg \
+    libboost-dev \
+    libboost-filesystem-dev \
+    libboost-program-options-dev \
+    libboost-system-dev \
+    libboost-test-dev \
+    libboost-thread-dev \
+    libcairo2-dev \
+    libglib2.0-dev \
+    libgtest-dev \
+    libgtk-3-dev \
+    libtiff5-dev \
+    ninja-build \
+    python3 \
+    python3-pip \
+    software-properties-common \
+    time \
+    wget \
+    xvfb
+
+# CMake repo
+
+RUN \
+  wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | \
+    gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware-archive-keyring.gpg
+
+RUN \
+  if [ "oracular" = "focal" ] ; then \
+    echo 'deb https://apt.kitware.com/ubuntu/ oracular main' > /etc/apt/sources.list.d/kitware.list ; \
+  fi
+
+RUN \
+  export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update -y && \
+  apt-get install -y \
+    cmake
+
+# GCC repo
+
+RUN \
+  if [ "oracular" = "focal" ] ; then \
+    add-apt-repository ppa:ubuntu-toolchain-r/test ; \
+  fi
+
+RUN \
+  export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update -y && \
+  if [ "oracular" = "focal" ] ; then \
+    apt-get install -y gcc-11 g++-11 && \
+    update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
+      --slave /usr/bin/g++ g++ /usr/bin/g++-11 \
+      --slave /usr/bin/gcov gcov /usr/bin/gcov-11 ; \
+  else \
+    apt-get install -y gcc g++ ; \
+  fi
+
+# LLVM repo
+
+RUN \
+  wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key 2>/dev/null | \
+    gpg --dearmor - > /etc/apt/trusted.gpg.d/llvm-snapshot.gpg
+
+RUN \
+  if [ "oracular" = "focal" ] ; then \
+    echo 'deb http://apt.llvm.org/oracular/ llvm-toolchain-oracular-11 main' > /etc/apt/sources.list.d/llvm.list ; \
+  fi
+
+RUN \
+  export DEBIAN_FRONTEND=noninteractive && \
+  apt-get update -y && \
+  if [ "oracular" = "focal" ] ; then \
+    apt-get install -y \
+      clang++-11 \
+      clang-11 && \
+    update-alternatives --install /usr/bin/clang clang /usr/bin/clang-11 110 \
+      --slave /usr/bin/clang++ clang++ /usr/bin/clang++-11 ; \
+  else \
+    apt-get install -y \
+      clang ; \
+  fi
+
+RUN \
+  update-alternatives --install /usr/bin/python python /usr/bin/python3 30 \
+    --slave /usr/bin/pip pip /usr/bin/pip3
+
+CMD ["/bin/bash"]

supported-ubuntu-releases

@@ -1,4 +1,5 @@
 focal
 jammy
-lunar
 mantic
+noble
+oracular