From 520c408e3e37223a9bf066d15902b90140862ed1 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Thu, 27 Nov 2025 15:49:59 +0100 Subject: [PATCH 01/10] Bump to Ubuntu 22.04 --- buildenv/base/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildenv/base/Dockerfile b/buildenv/base/Dockerfile index f0b1fc2..0478b9a 100644 --- a/buildenv/base/Dockerfile +++ b/buildenv/base/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 -ENV UBUNTUVERSION="focal" \ +ENV UBUNTUVERSION="jammy" \ DEBIAN_FRONTEND="noninteractive" # install base requirements + stuff that makes debugging easier From e32e651138083a479b0292a2d1b829d101610b94 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Thu, 27 Nov 2025 15:52:41 +0100 Subject: [PATCH 02/10] Bump clang to 14 --- buildenv/clang/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index b1f06b3..92c1af9 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -1,6 +1,6 @@ FROM autopas/build-base -ENV CLANGVERSION 13 +ENV CLANGVERSION=14 # add llvm repository RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ From 8f937f2673bb919bfea5e55a99fdf5058ab4247d Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Thu, 27 Nov 2025 17:00:16 +0100 Subject: [PATCH 03/10] add libclang-rt, needed for ASan --- buildenv/clang/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index 92c1af9..99b7d30 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -16,6 +16,7 @@ RUN true \ && apt-get -qq install -y --no-install-recommends \ clang-${CLANGVERSION} \ lldb-${CLANGVERSION} \ + libclang-rt-${CLANGVERSION}-dev \ libmpich-dev \ libomp-${CLANGVERSION}-dev \ clang-format-${CLANGVERSION} \ From a357abc02e95608d0cc502b1be61732798b9e9c5 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Thu, 27 Nov 2025 18:19:18 +0100 Subject: [PATCH 04/10] Bump clang to 15 --- buildenv/clang/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index 99b7d30..515fd0c 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -1,6 +1,6 @@ FROM autopas/build-base -ENV CLANGVERSION=14 +ENV CLANGVERSION=15 # add llvm repository RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ @@ -16,7 +16,6 @@ RUN true \ && apt-get -qq install -y --no-install-recommends \ clang-${CLANGVERSION} \ lldb-${CLANGVERSION} \ - libclang-rt-${CLANGVERSION}-dev \ libmpich-dev \ libomp-${CLANGVERSION}-dev \ clang-format-${CLANGVERSION} \ From 3cd7db5b3f4a4e880e10d2645c738b50dc9dbf29 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Fri, 28 Nov 2025 17:55:13 +0100 Subject: [PATCH 05/10] Upgrade to ubuntu2404 --- buildenv/archer/Dockerfile | 2 +- buildenv/base/Dockerfile | 53 +++++++++---------------------- buildenv/clang/Dockerfile | 5 ++- buildenv/gcc/Dockerfile | 11 +++---- buildenv/intel-one-api/Dockerfile | 33 +++---------------- 5 files changed, 28 insertions(+), 76 deletions(-) diff --git a/buildenv/archer/Dockerfile b/buildenv/archer/Dockerfile index 5aba3fc..e332e53 100644 --- a/buildenv/archer/Dockerfile +++ b/buildenv/archer/Dockerfile @@ -6,7 +6,7 @@ RUN true \ ca-certificates \ && rm -rf /var/lib/apt/lists/* -ENV CLANGVERSION 13 +ENV CLANGVERSION 16 # add llvm repository RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ diff --git a/buildenv/base/Dockerfile b/buildenv/base/Dockerfile index 0478b9a..13e7127 100644 --- a/buildenv/base/Dockerfile +++ b/buildenv/base/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:22.04 +FROM ubuntu:24.04 -ENV UBUNTUVERSION="jammy" \ +ENV UBUNTUVERSION="noble" \ DEBIAN_FRONTEND="noninteractive" # install base requirements + stuff that makes debugging easier @@ -10,6 +10,7 @@ RUN true \ build-essential \ ca-certificates \ ccache \ + cmake \ gdb \ git \ gnupg \ @@ -22,45 +23,21 @@ RUN true \ # install AutoPas dependencies so we don't rely on bundled versions libeigen3-dev \ libyaml-cpp-dev \ - # libspdlog-dev \ <- version too old. Needs at least 1.3.1 - # needed for bundled antlr4 (rule based tuning parser engine) + libspdlog-dev \ +# needed for bundled antlr4 (rule based tuning parser engine) uuid-dev \ && rm -rf /var/lib/apt/lists/* -# we might want to fix the certificate stuff -RUN wget \ - --no-verbose \ - -O cmakeInstallScript.sh \ - https://github.com/Kitware/CMake/releases/download/v3.21.0-rc3/cmake-3.21.0-rc3-linux-x86_64.sh \ - --no-check-certificate \ - && bash cmakeInstallScript.sh \ - --skip-license \ - --prefix=/usr \ - && rm cmakeInstallScript.sh - -# if we ever need to switch to manual install -# RUN apt-get -qq install -y cmake \ - # && wget --no-verbose https://github.com/Kitware/CMake/releases/download/v3.15.0-rc3/cmake-3.15.0-rc3.tar.gz \ - # && tar -xzf cmake-3.15.0-rc3.tar.gz \ - # && cd $_ \ - # && mkdir build \ - # && cd build \ - # && cmake .. \ - # && make -j4 \ - # && make install - -# install spdlog from source bc repo version is too old -RUN wget --no-verbose -O spdlog.tgz https://github.com/gabime/spdlog/archive/v1.4.2.tar.gz --no-check-certificate \ - && tar -xzf spdlog.tgz \ - && rm spdlog.tgz \ - && cd spdlog-* \ - && mkdir build \ - && cd build \ - && cmake .. \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DSPDLOG_BUILD_EXAMPLE=OFF \ - -DSPDLOG_BUILD_TESTS=OFF \ - && make install -j4 +# If we need a newer version of cmake +# RUN wget \ +# --no-verbose \ +# -O cmakeInstallScript.sh \ +# https://github.com/Kitware/CMake/releases/download/v3.21.0-rc3/cmake-3.21.0-rc3-linux-x86_64.sh \ +# --no-check-certificate \ +# && bash cmakeInstallScript.sh \ +# --skip-license \ +# --prefix=/usr \ +# && rm cmakeInstallScript.sh COPY bin/entrypoint.sh /usr/local/bin RUN ln -s /usr/local/bin/entrypoint.sh / # backwards compat diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index 515fd0c..055a456 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -1,6 +1,6 @@ FROM autopas/build-base -ENV CLANGVERSION=15 +ENV CLANGVERSION=16 # add llvm repository RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ @@ -10,13 +10,12 @@ deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${ RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - # install stuff -# openmpi 4.0.3 still has a memory leak, hence install mpich RUN true \ && apt-get -qq update \ && apt-get -qq install -y --no-install-recommends \ clang-${CLANGVERSION} \ lldb-${CLANGVERSION} \ - libmpich-dev \ + libopenmpi-dev \ libomp-${CLANGVERSION}-dev \ clang-format-${CLANGVERSION} \ python3-pip \ diff --git a/buildenv/gcc/Dockerfile b/buildenv/gcc/Dockerfile index f5fdb8f..2f33910 100644 --- a/buildenv/gcc/Dockerfile +++ b/buildenv/gcc/Dockerfile @@ -1,14 +1,13 @@ FROM autopas/build-base -ENV GCCVERSION="11" +ENV GCCVERSION="13" # install stuff -# openmpi 4.0.3 still has a memory leak, hence install mpich -# add ppa for newer gcc, install gcc-11, and set links to make it default +# add ppa for newer gcc, install gcc-13, and set links to make it default RUN true \ && apt-get -qq update \ && apt-get -qq install -y --no-install-recommends \ - libmpich-dev \ + libopenmpi-dev \ software-properties-common \ python3-dev \ && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ @@ -19,13 +18,13 @@ RUN true \ && ln -s -f /usr/bin/gcc-${GCCVERSION} /usr/bin/gcc \ && ln -s -f /usr/bin/g++-${GCCVERSION} /usr/bin/g++ -# install lcov and set gcov-11 +# install lcov and set gcov-13 RUN cd \ && perl -MCPAN -e 'install(Capture::Tiny, DateTime, Date::Parse, Cpanel::JSON::XS)' \ && git clone https://github.com/linux-test-project/lcov.git \ && cd lcov \ && make install \ - && update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-11 60 \ + && update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-13 60 \ && cd CMD ["sh", "-c", "cmake -GNinja ../.. && ninja && ninja test"] diff --git a/buildenv/intel-one-api/Dockerfile b/buildenv/intel-one-api/Dockerfile index 02a2928..2afa4d7 100644 --- a/buildenv/intel-one-api/Dockerfile +++ b/buildenv/intel-one-api/Dockerfile @@ -16,37 +16,14 @@ RUN true \ # install AutoPas dependencies so we don't rely on bundled versions libeigen3-dev \ libyaml-cpp-dev \ - # libspdlog-dev \ <- version too old. Needs at least 1.3.1 + libspdlog-dev \ && rm -rf /var/lib/apt/lists/* # we might want to fix the certificate stuff -RUN wget -O cmakeInstallScript.sh https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.sh --no-check-certificate \ - && chmod +x cmakeInstallScript.sh \ - && ./cmakeInstallScript.sh --skip-license --prefix=/usr/local/ \ - && rm cmakeInstallScript.sh - -# if we ever need to switch to manual install -# RUN apt-get -qq install -y cmake \ - # && wget https://github.com/Kitware/CMake/releases/download/v3.15.0-rc3/cmake-3.15.0-rc3.tar.gz \ - # && tar -xzf cmake-3.15.0-rc3.tar.gz \ - # && cd $_ \ - # && mkdir build \ - # && cd build \ - # && cmake .. \ - # && make -j4 \ - # && make install - -# install spdlog from source bc repo version is too old -RUN wget -O spdlog.tgz https://github.com/gabime/spdlog/archive/v1.4.2.tar.gz --no-check-certificate \ - && tar -xzf spdlog.tgz \ - && cd spdlog-* \ - && mkdir build \ - && cd build \ - && cmake .. \ - -DCMAKE_BUILD_TYPE=RELEASE \ - -DSPDLOG_BUILD_EXAMPLE=OFF \ - -DSPDLOG_BUILD_TESTS=OFF \ - && make install -j4 +# RUN wget -O cmakeInstallScript.sh https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.sh --no-check-certificate \ +# && chmod +x cmakeInstallScript.sh \ +# && ./cmakeInstallScript.sh --skip-license --prefix=/usr/local/ \ +# && rm cmakeInstallScript.sh COPY bin/entrypoint.sh /usr/local/bin RUN ln -s /usr/local/bin/entrypoint.sh / # backwards compat From dad7b55d026b4647a5368ad486f2da2d964679c3 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Fri, 28 Nov 2025 20:59:34 +0100 Subject: [PATCH 06/10] Fix Dockerfiles for clang and archer --- buildenv/archer/Dockerfile | 35 ++++++++++++++++++++++++++--------- buildenv/clang/Dockerfile | 12 +++++------- 2 files changed, 31 insertions(+), 16 deletions(-) diff --git a/buildenv/archer/Dockerfile b/buildenv/archer/Dockerfile index e332e53..09a2b92 100644 --- a/buildenv/archer/Dockerfile +++ b/buildenv/archer/Dockerfile @@ -6,14 +6,14 @@ RUN true \ ca-certificates \ && rm -rf /var/lib/apt/lists/* -ENV CLANGVERSION 16 +ENV CLANGVERSION=16 -# add llvm repository -RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ -deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main" > /etc/apt/sources.list.d/llvm.list +# add llvm repository (needed for newer versions of clang) +# RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ +# deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main" > /etc/apt/sources.list.d/llvm.list # add llvm repo key -RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +# RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - # install clang llvm and python3-dev RUN true \ @@ -31,7 +31,7 @@ RUN ln -s /usr/bin/clang++-${CLANGVERSION} /usr/bin/clang++ RUN ln -s /usr/bin/llvm-config-${CLANGVERSION} /usr/bin/llvm-config # build everything in /ArcherBuild -ENV ARCHER_BUILD /ArcherBuild +ENV ARCHER_BUILD=/ArcherBuild RUN mkdir $ARCHER_BUILD WORKDIR $ARCHER_BUILD @@ -40,17 +40,34 @@ RUN git config --global http.sslVerify false #get, build and install openmp runtime RUN git clone https://github.com/llvm/llvm-project --depth 1 -b release/${CLANGVERSION}.x llvm -WORKDIR llvm/openmp -ENV OPENMP_INSTALL /usr +ENV OPENMP_INSTALL=/usr/local +# Need to install llvm-config first +WORKDIR llvm +RUN mkdir build +WORKDIR build +RUN cmake -G Ninja \ + -D LLVM_ENABLE_PROJECTS="" \ + -D LLVM_TARGETS_TO_BUILD="X86" \ + -D LLVM_INCLUDE_TESTS=OFF \ + -D LLVM_INCLUDE_BENCHMARKS=OFF \ + -D LLVM_INCLUDE_EXAMPLES=OFF \ + -D CMAKE_BUILD_TYPE=Release \ + -D CMAKE_INSTALL_PREFIX=${OPENMP_INSTALL} \ + ../llvm +RUN ninja llvm-config +RUN ninja install + +# Then install llvm openmp runtime which includes archer +WORKDIR ../openmp RUN mkdir build WORKDIR build RUN cmake -G Ninja \ -D CMAKE_C_COMPILER=clang \ -D CMAKE_CXX_COMPILER=clang++ \ -D CMAKE_BUILD_TYPE=RELEASE \ - -D CMAKE_INSTALL_PREFIX:PATH=${OPENMP_INSTALL} \ + -D CMAKE_INSTALL_PREFIX=${OPENMP_INSTALL} \ -D LIBOMP_OMPT_SUPPORT=ON \ .. RUN ninja diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index 055a456..0ad80b1 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -2,12 +2,12 @@ FROM autopas/build-base ENV CLANGVERSION=16 -# add llvm repository -RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ -deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n" >> /etc/apt/sources.list.d/llvm.list +# add llvm repository (needed for newer clang versions) +# RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ +# deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n" >> /etc/apt/sources.list.d/llvm.list # add llvm repo key -RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - +# RUN wget --no-check-certificate -O - https://apt.llvm.org/llvm-snapshot.gpg.key|apt-key add - # install stuff RUN true \ @@ -18,11 +18,9 @@ RUN true \ libopenmpi-dev \ libomp-${CLANGVERSION}-dev \ clang-format-${CLANGVERSION} \ - python3-pip \ - python3-setuptools \ + cmake-format \ python3-dev \ && rm -rf /var/lib/apt/lists/* -RUN pip3 install --upgrade cmake-format # generate version agnostic links to clang RUN ln -s /usr/bin/clang-${CLANGVERSION} /usr/bin/clang From 3563fc665ad8e72922a84105670d664b7bb0b9ce Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Fri, 28 Nov 2025 21:31:20 +0100 Subject: [PATCH 07/10] Add extra asan runtime for clang 16 --- buildenv/clang/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index 0ad80b1..c824ada 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -15,6 +15,7 @@ RUN true \ && apt-get -qq install -y --no-install-recommends \ clang-${CLANGVERSION} \ lldb-${CLANGVERSION} \ + libclang-rt-${CLANGVERSION}-dev \ libopenmpi-dev \ libomp-${CLANGVERSION}-dev \ clang-format-${CLANGVERSION} \ From b02e55ab7385310f160c9eacd2d030e9605d105d Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Tue, 2 Dec 2025 15:26:12 +0100 Subject: [PATCH 08/10] install mpi from source --- buildenv/archer/Dockerfile | 1 + buildenv/clang/Dockerfile | 14 +++++++++++++- buildenv/gcc/Dockerfile | 24 ++++++++++++++++++------ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/buildenv/archer/Dockerfile b/buildenv/archer/Dockerfile index 09a2b92..d659d42 100644 --- a/buildenv/archer/Dockerfile +++ b/buildenv/archer/Dockerfile @@ -21,6 +21,7 @@ RUN true \ && apt-get -qq install -y --no-install-recommends \ clang-${CLANGVERSION} \ lldb-${CLANGVERSION} \ + libclang-rt-${CLANGVERSION}-dev \ unzip \ python3-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index c824ada..f738283 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -16,13 +16,25 @@ RUN true \ clang-${CLANGVERSION} \ lldb-${CLANGVERSION} \ libclang-rt-${CLANGVERSION}-dev \ - libopenmpi-dev \ libomp-${CLANGVERSION}-dev \ clang-format-${CLANGVERSION} \ cmake-format \ python3-dev \ && rm -rf /var/lib/apt/lists/* +# openmpi has memory leaks and mpich from apt has bugs +# install mpich from source +WORKDIR /tmp +RUN wget https://www.mpich.org/static/downloads/4.3.2rc2/mpich-4.3.2rc2.tar.gz && \ + tar -zxvf mpich-4.3.2rc2.tar.gz && \ + cd mpich-4.3.2rc2 && \ + ./configure --prefix=/usr --disable-fortran && \ + make && \ + make install && \ + ldconfig + +ENV PATH=/usr/local/bin:$PATH + # generate version agnostic links to clang RUN ln -s /usr/bin/clang-${CLANGVERSION} /usr/bin/clang RUN ln -s /usr/bin/clang++-${CLANGVERSION} /usr/bin/clang++ diff --git a/buildenv/gcc/Dockerfile b/buildenv/gcc/Dockerfile index 2f33910..3d4957c 100644 --- a/buildenv/gcc/Dockerfile +++ b/buildenv/gcc/Dockerfile @@ -3,21 +3,33 @@ FROM autopas/build-base ENV GCCVERSION="13" # install stuff -# add ppa for newer gcc, install gcc-13, and set links to make it default +# install gcc-13, and set links to make it default RUN true \ && apt-get -qq update \ && apt-get -qq install -y --no-install-recommends \ - libopenmpi-dev \ + autoconf \ + automake \ + g++-${GCCVERSION} \ + libtool \ software-properties-common \ python3-dev \ - && add-apt-repository -y ppa:ubuntu-toolchain-r/test \ - && apt-get -qq update \ - && apt-get -qq install -y --no-install-recommends \ - g++-${GCCVERSION} \ && rm -rf /var/lib/apt/lists/* \ && ln -s -f /usr/bin/gcc-${GCCVERSION} /usr/bin/gcc \ && ln -s -f /usr/bin/g++-${GCCVERSION} /usr/bin/g++ +# openmpi has memory leaks and mpich from apt has bugs +# install mpich from source +WORKDIR /tmp +RUN wget https://www.mpich.org/static/downloads/4.3.2rc2/mpich-4.3.2rc2.tar.gz && \ + tar -zxvf mpich-4.3.2rc2.tar.gz && \ + cd mpich-4.3.2rc2 && \ + ./configure --prefix=/usr --disable-fortran && \ + make && \ + make install && \ + ldconfig + +ENV PATH=/usr/local/bin:$PATH + # install lcov and set gcov-13 RUN cd \ && perl -MCPAN -e 'install(Capture::Tiny, DateTime, Date::Parse, Cpanel::JSON::XS)' \ From 52d7b5958c449d54073b778945cf5525e47b2238 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Wed, 3 Dec 2025 11:54:55 +0100 Subject: [PATCH 09/10] Remove not needed path addition --- buildenv/clang/Dockerfile | 2 -- buildenv/gcc/Dockerfile | 2 -- 2 files changed, 4 deletions(-) diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index f738283..ba7bc28 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -33,8 +33,6 @@ RUN wget https://www.mpich.org/static/downloads/4.3.2rc2/mpich-4.3.2rc2.tar.gz & make install && \ ldconfig -ENV PATH=/usr/local/bin:$PATH - # generate version agnostic links to clang RUN ln -s /usr/bin/clang-${CLANGVERSION} /usr/bin/clang RUN ln -s /usr/bin/clang++-${CLANGVERSION} /usr/bin/clang++ diff --git a/buildenv/gcc/Dockerfile b/buildenv/gcc/Dockerfile index 3d4957c..b1b2046 100644 --- a/buildenv/gcc/Dockerfile +++ b/buildenv/gcc/Dockerfile @@ -28,8 +28,6 @@ RUN wget https://www.mpich.org/static/downloads/4.3.2rc2/mpich-4.3.2rc2.tar.gz & make install && \ ldconfig -ENV PATH=/usr/local/bin:$PATH - # install lcov and set gcov-13 RUN cd \ && perl -MCPAN -e 'install(Capture::Tiny, DateTime, Date::Parse, Cpanel::JSON::XS)' \ From f6dcdaf817cd9ce596067358a8292c735d316527 Mon Sep 17 00:00:00 2001 From: Markus Muehlhaeusser Date: Tue, 9 Dec 2025 16:45:48 +0100 Subject: [PATCH 10/10] Remove/Change commented out lines as per review --- buildenv/archer/Dockerfile | 2 +- buildenv/clang/Dockerfile | 2 +- buildenv/intel-one-api/Dockerfile | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/buildenv/archer/Dockerfile b/buildenv/archer/Dockerfile index d659d42..9a55320 100644 --- a/buildenv/archer/Dockerfile +++ b/buildenv/archer/Dockerfile @@ -8,7 +8,7 @@ RUN true \ ENV CLANGVERSION=16 -# add llvm repository (needed for newer versions of clang) +# Add llvm repository (can be used to get newer versions of clang) # RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ # deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main" > /etc/apt/sources.list.d/llvm.list diff --git a/buildenv/clang/Dockerfile b/buildenv/clang/Dockerfile index ba7bc28..66c1289 100644 --- a/buildenv/clang/Dockerfile +++ b/buildenv/clang/Dockerfile @@ -2,7 +2,7 @@ FROM autopas/build-base ENV CLANGVERSION=16 -# add llvm repository (needed for newer clang versions) +# Add llvm repository (can be used to get newer clang versions) # RUN echo "deb http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n\ # deb-src http://apt.llvm.org/${UBUNTUVERSION}/ llvm-toolchain-${UBUNTUVERSION}-${CLANGVERSION} main\n" >> /etc/apt/sources.list.d/llvm.list diff --git a/buildenv/intel-one-api/Dockerfile b/buildenv/intel-one-api/Dockerfile index 2afa4d7..1a31a7e 100644 --- a/buildenv/intel-one-api/Dockerfile +++ b/buildenv/intel-one-api/Dockerfile @@ -19,12 +19,6 @@ RUN true \ libspdlog-dev \ && rm -rf /var/lib/apt/lists/* -# we might want to fix the certificate stuff -# RUN wget -O cmakeInstallScript.sh https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.sh --no-check-certificate \ -# && chmod +x cmakeInstallScript.sh \ -# && ./cmakeInstallScript.sh --skip-license --prefix=/usr/local/ \ -# && rm cmakeInstallScript.sh - COPY bin/entrypoint.sh /usr/local/bin RUN ln -s /usr/local/bin/entrypoint.sh / # backwards compat RUN mkdir -p /ccache_default_dir