Merge Dockerfile ubuntu:24.0 into Dockerfile

.github/workflows/docker-ci.yml

@@ -84,7 +84,6 @@ jobs:
           - os: ubuntu:24.04
             llvm: 16
             gcc: 9
-            file: Dockerfile_ubuntu-24.04
     runs-on: ubuntu-22.04
     env:
       TEST_TAG: verificarlo/verificarlo:test-llvm-${{ matrix.llvm }}

Dockerfile

@@ -19,16 +19,16 @@ ENV PYTHONPATH /usr/local/lib/python${PYTHON_VERSION}/site-packages/:${PYTHONPAT
 # Retrieve dependencies
 RUN apt-get -y update && apt-get -y --no-install-recommends install tzdata
 
-RUN export UBUNTU_VERSION=$(grep 'VERSION_ID' /etc/os-release | cut -d'=' -f2) ; \
-    if [ "$UBUNTU_VERSION" = "ubuntu:24.04" ]; then \
-    apt-get -y install --no-install-recommends libclang-rt-${LLVM_VERSION}-dev ; \
-    fi
-
-RUN apt-get -y install --no-install-recommends \
+RUN export UBUNTU_VERSION=$(grep 'VERSION_ID' /etc/os-release | cut -d'=' -f2 | tr -d '"' ) && \
+    if [ "$UBUNTU_VERSION" = "24.04" ]; then \
+    export LIBCLANG_RT="libclang-rt-${LLVM_VERSION}-dev" ; \
+    fi && \
+    apt-get -y install --no-install-recommends \
     bash ca-certificates make git libmpfr-dev \
     autogen dh-autoreconf autoconf automake autotools-dev libedit-dev libtool libz-dev binutils \
     clang-${LLVM_VERSION} llvm-${LLVM_VERSION} llvm-${LLVM_VERSION}-dev \
     libomp5-${LLVM_VERSION} libomp-${LLVM_VERSION}-dev \
+    ${LIBCLANG_RT} \
     gcc-${GCC_VERSION} g++-${GCC_VERSION} \
     gfortran-${GCC_VERSION} libgfortran-${GCC_VERSION}-dev ${WITH_FLANG} \
     python3 python3-pip python3-dev cython3 parallel && \