Update clang-17 and 18 docker containers

boostorg · Jul 24, 2024 · 1e06ba2 · 1e06ba2
1 parent a94bdc6
commit 1e06ba2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/tools/docker/build-clang17.dockerfile b/tools/docker/build-clang17.dockerfile
@@ -5,7 +5,7 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 RUN \
     apt-get update && \

diff --git a/tools/docker/build-clang18.dockerfile b/tools/docker/build-clang18.dockerfile
@@ -5,30 +5,22 @@
 # file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #
 
-FROM ubuntu:23.10
+FROM ubuntu:24.04
 
 RUN \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        wget \
         ca-certificates \
+        clang-18 \
+        libclang-rt-18-dev \
+        libc++-18-dev \
+        libc++abi-18-dev \
         libssl-dev \
         git \
         ninja-build \
         python3 \
         python3-requests \
         python-is-python3 \
         mysql-client && \
-    echo 'deb http://apt.llvm.org/mantic/ llvm-toolchain-mantic-18 main' > /etc/apt/sources.list.d/llvm.list && \
-    wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key > /etc/apt/trusted.gpg.d/apt.llvm.org.asc && \
-    apt-get update && \
-    apt-get --no-install-recommends -y install \
-        clang-18 \
-        libclang-rt-18-dev \
-        libc++-18-dev \
-        libc++abi-18-dev && \
-    apt-get -y remove wget && \
-    apt-get -y autoremove && \
     ln -s /usr/bin/clang++-18 /usr/bin/clang++ && \
     ln -s /usr/bin/clang-18 /usr/bin/clang
-