From 1b3c69d2a3f09c4b88d5abffc87d986322dbb13b Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 11 Dec 2023 20:05:13 +0800 Subject: [PATCH] docker: install clang-tools-17 to build with C++20 modules support, CMake needs to use clang-scan-deps, which is packaged by clang-tools-17, see https://packages.debian.org/sid/amd64/clang-tools-17/filelist and https://packages.ubuntu.com/mantic/amd64/clang-tools-17/filelist, so we have to install it in our CI image. Signed-off-by: Kefu Chai Closes scylladb/seastar#1999 [avi: regenerate docker image] --- .circleci/config.yml | 2 +- docker/dev/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a9b2f2768e..00aff5a6aab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ jobs: - checkout - run: git submodule sync - run: git submodule update --init - - run: echo 'docker run --pids-limit -1 --security-opt seccomp=unconfined --network host --user "$(id -u):$(id -g)" --rm -v $PWD:$PWD -w $PWD docker.io/scylladb/seastar-toolchain:2023-12-05 "$@"' > run; chmod +x run + - run: echo 'docker run --pids-limit -1 --security-opt seccomp=unconfined --network host --user "$(id -u):$(id -g)" --rm -v $PWD:$PWD -w $PWD docker.io/scylladb/seastar-toolchain:2023-12-28 "$@"' > run; chmod +x run - when: condition: equal: [ "enable-dpdk", << parameters.with_dpdk >> ] diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 103db6b4658..2ccf12becae 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -6,7 +6,7 @@ RUN apt -y update \ && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 \ && update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 13 \ && update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-13 13 \ - && apt -y install clang-16 clang-17 \ + && apt -y install clang-16 clang-17 clang-tools-17 \ && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-16 16 \ && update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-16 16 \ && update-alternatives --install /usr/bin/clang clang /usr/bin/clang-17 17 \