@@ -4,6 +4,8 @@ FROM ubuntu:${VARIANT}
44
55# Restate the variant to use it later on in the llvm and cmake installations
66ARG VARIANT
7+ ARG CMAKE_VERSION=3.28.3
8+ ENV PATH="${PATH}:/cmake-${CMAKE_VERSION}-linux-x86_64/bin/:"
79
810# Install necessary packages available from standard repos
911RUN apt-get update -qq && export DEBIAN_FRONTEND=noninteractive && \
@@ -29,7 +31,7 @@ ENV CONAN_SYSREQUIRES_SUDO 0
2931ENV CONAN_SYSREQUIRES_MODE enabled
3032
3133# User-settable versions:
32- # This Dockerfile should support gcc-[10, 11, 12] and clang-[10, 11, 12, 13, 14, 15]
34+ # This Dockerfile should support gcc-[10, 11, 12, 13 ] and clang-[10, 11, 12, 13, 14, 15, 16, 17 ]
3335# Earlier versions of clang will require significant modifications to the IWYU section
3436ARG GCC_VER="12"
3537# Add gcc-${GCC_VER}
@@ -42,7 +44,7 @@ RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test && \
4244RUN update-alternatives --install /usr/bin/gcc gcc $(which gcc-${GCC_VER}) 100
4345RUN update-alternatives --install /usr/bin/g++ g++ $(which g++-${GCC_VER}) 100
4446
45- ARG LLVM_VER="15 "
47+ ARG LLVM_VER="17 "
4648# Add clang-${LLVM_VER}
4749ARG LLVM_URL="http://apt.llvm.org/${VARIANT}/"
4850ARG LLVM_PKG="llvm-toolchain-${VARIANT}-${LLVM_VER}"
@@ -60,15 +62,11 @@ RUN update-alternatives --install /usr/bin/clang-tidy clang-tidy $(which clang-t
6062RUN update-alternatives --install /usr/bin/clang clang $(which clang-${LLVM_VER}) 100
6163RUN update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-${LLVM_VER}) 100
6264
63- # Add current cmake/ccmake, from Kitware
64- ARG CMAKE_URL="https://apt.kitware.com/ubuntu/"
65- # FALLBACK because lunar isn't support yet by kitware
66- ARG CMAKE_PKG=${VARIANT}
67- RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null \
68- | gpg --dearmor - | tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && \
69- apt-add-repository -y "deb ${CMAKE_URL} ${CMAKE_PKG} main" && \
70- apt-get update -qq && export DEBIAN_FRONTEND=noninteractive && \
71- apt-get install -y --no-install-recommends cmake cmake-curses-gui
65+ # Add install cmake/ccmake
66+ RUN wget https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}-linux-x86_64.sh \
67+ && chmod +x cmake-${CMAKE_VERSION}-linux-x86_64.sh \
68+ && ./cmake-${CMAKE_VERSION}-linux-x86_64.sh --include-subdir --skip-license \
69+ && rm cmake-${CMAKE_VERSION}-linux-x86_64.sh
7270
7371# Install editors
7472RUN apt-get update -qq && export DEBIAN_FRONTEND=noninteractive && \
0 commit comments