#2268: add missing dependencies to clang dockerfile

DARMA-tasking · Nov 18, 2024 · 5d703e0 · 5d703e0
1 parent 11c64cf
commit 5d703e0
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 56 deletions.
diff --git a/ci/docker/ubuntu-clang-cpp.dockerfile b/ci/docker/ubuntu-clang-cpp.dockerfile
@@ -1,6 +1,6 @@
 ARG arch=amd64
 ARG ubuntu=20.04
-FROM ${arch}/ubuntu:${ubuntu} as base
+FROM ${arch}/ubuntu:${ubuntu} AS base
 
 ARG proxy=""
 ARG compiler=clang-11
@@ -14,22 +14,27 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
-    ${compiler} \
-    ${ubsan_enabled:+llvm-$(echo ${compiler} | cut -d- -f2)} \
-    ca-certificates \
-    ccache \
-    curl \
-    git \
-    less \
-    libomp-dev \
-    libomp5 \
-    make-guile \
-    ninja-build \
-    python3 \
-    valgrind \
-    wget \
-    zlib1g \
-    zlib1g-dev && \
+        ${compiler} \
+        ${ubsan_enabled:+llvm-$(echo ${compiler} | cut -d- -f2)} \
+        brotli \
+        ca-certificates \
+        ccache \
+        curl \
+        git \
+        less \
+        libomp-dev \
+        libomp5 \
+        make-guile \
+        ninja-build \
+        python3 \
+        python3-brotli \
+        python3-deepdiff \
+        python3-pip \
+        python3-schema \
+        valgrind \
+        wget \
+        zlib1g \
+        zlib1g-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -52,10 +57,7 @@ ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8
 
 COPY ./ci/deps/mpich.sh mpich.sh
-RUN if [ "$ubuntu" = "18.04" ]; then \
-      ./mpich.sh 3.3.2 -j4; else \
-      ./mpich.sh 4.0.2 -j4; \
-    fi
+RUN ./mpich.sh 4.0.2 -j4
 
 ENV MPI_EXTRA_FLAGS="" \
     CMAKE_PREFIX_PATH="/lib/x86_64-linux-gnu/" \
@@ -109,7 +111,7 @@ ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \
 
 RUN /vt/ci/build_cpp.sh /vt /build
 
-FROM build as test
+FROM build AS test
 RUN /vt/ci/test_cpp.sh /vt /build
 
 RUN /vt/ci/build_vt_sample.sh /vt /build
diff --git a/ci/docker/ubuntu-gnu-cpp.dockerfile b/ci/docker/ubuntu-gnu-cpp.dockerfile
@@ -1,6 +1,6 @@
 ARG arch=amd64
 ARG ubuntu=20.04
-FROM ${arch}/ubuntu:${ubuntu} as base
+FROM ${arch}/ubuntu:${ubuntu} AS base
 
 ARG proxy=""
 ARG compiler=gcc-9
@@ -15,34 +15,34 @@ ARG zoltan_enabled
 
 RUN apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
-    ${compiler} \
-    g++-$(echo ${compiler} | cut -d- -f2) \
-    ${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \
-    ca-certificates \
-    ccache \
-    curl \
-    git \
-    less \
-    libomp5 \
-    libunwind-dev \
-    make-guile \
-    ninja-build \
-    valgrind \
-    wget \
-    zlib1g \
-    zlib1g-dev \
-    libncurses5-dev \
-    m4 \
-    libgl1-mesa-dev \
-    libglu1-mesa-dev \
-    mesa-common-dev \
-    brotli \
-    python3 \
-    python3-schema \
-    python3-deepdiff \
-    python3-brotli \
-    python3-numpy \
-    python3-pip && \
+        ${compiler} \
+        g++-$(echo ${compiler} | cut -d- -f2) \
+        ${zoltan_enabled:+gfortran-$(echo ${compiler} | cut -d- -f2)} \
+        brotli \
+        ca-certificates \
+        ccache \
+        curl \
+        git \
+        less \
+        libgl1-mesa-dev \
+        libglu1-mesa-dev \
+        libncurses5-dev \
+        libomp5 \
+        libunwind-dev \
+        m4 \
+        make-guile \
+        mesa-common-dev \
+        ninja-build \
+        python3 \
+        python3-brotli \
+        python3-deepdiff \
+        python3-numpy \
+        python3-pip \
+        python3-schema \
+        valgrind \
+        wget \
+        zlib1g \
+        zlib1g-dev && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -72,10 +72,7 @@ ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8
 
 COPY ./ci/deps/mpich.sh mpich.sh
-RUN if [ "$ubuntu" = "18.04" ]; then \
-      ./mpich.sh 3.3.2 -j4; else \
-      ./mpich.sh 4.0.2 -j4; \
-    fi
+RUN ./mpich.sh 4.0.2 -j4
 
 ENV MPI_EXTRA_FLAGS="" \
     PATH=/usr/lib/ccache/:$PATH
@@ -146,7 +143,7 @@ ENV BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} \
 
 RUN /vt/ci/build_cpp.sh /vt /build
 
-FROM build as test
+FROM build AS test
 RUN /vt/ci/test_cpp.sh /vt /build
 
 RUN /vt/ci/build_vt_sample.sh /vt /build