diff --git a/Dockerfile.build.macosx b/Dockerfile.build.macosx index 2a943ba..26ccfe1 100644 --- a/Dockerfile.build.macosx +++ b/Dockerfile.build.macosx @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 # Work around for 16.04 host which has old docker version # RUN sed -i -e 's/ { / /' -e 's/ };//' /etc/apt/apt.conf.d/docker-clean @@ -16,7 +16,7 @@ RUN apt-get install -y cmake doxygen graphviz # Install Linting Tools -RUN apt-get install -y clang-10 clang-tidy-10 clang-format-10 clang-tools-10 lld-10 llvm-10-dev +RUN apt-get install -y clang-14 clang-tidy-14 clang-format-14 clang-tools-14 lld-14 llvm-14-dev llvm-14-linker-tools # Install Build Tools ADD osxcross.tar.bz2 ./ @@ -29,8 +29,8 @@ ENV PATH="/osxcross/bin:${PATH}" # Create links for clang for version 10 -RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-10 20 -RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-10 20 -RUN update-alternatives --set clang /usr/bin/clang-10 -RUN update-alternatives --set clang++ /usr/bin/clang++-10 +RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 20 +RUN update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-14 20 +RUN update-alternatives --set clang /usr/bin/clang-14 +RUN update-alternatives --set clang++ /usr/bin/clang++-14