From aa9959c8332b30d90d7cfa3674ec09defdf29b14 Mon Sep 17 00:00:00 2001 From: Hans Johnson Date: Sun, 26 Jan 2025 07:31:30 -0600 Subject: [PATCH] ENH: Update to Ubuntu 24.04 and clang-format-19 Match the clang-format used in master branch of ITK. --- Dockerfile | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70c282d..6cfedee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,27 @@ -FROM ubuntu:18.04 +FROM ubuntu:24.04 COPY LICENSE README.md / RUN apt-get update && apt-get install -y \ - clang-format-8 \ git \ wget \ - && cd /usr/bin && ln -s clang-format-8 clang-format + lsb-release \ + software-properties-common \ + gnupg \ + && apt-get clean + +# Download latest .deb packages from llvm. +# See https://apt.llvm.org/ for instructions. +RUN wget https://apt.llvm.org/llvm.sh \ + && chmod +x llvm.sh \ + && ./llvm.sh 19 \ + && apt-get install clang-format-19 \ + && apt-get clean + +# The following is a workaround to allow other scripts +# that were hard-coded to use the unversioned clang-format +# binary to continue to work. +RUN cd /usr/bin && rm -rf clang-format && ln -s clang-format-19 clang-format COPY entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh