From 28d576d5422e08dde08cbb2b960c0452780ca8dd Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Tue, 21 May 2024 23:16:34 +0200 Subject: [PATCH] Update to ubuntu:jammy and clang-11 --- tools/docker-pugs.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/docker-pugs.sh b/tools/docker-pugs.sh index 4a5b0d661..35d98b545 100755 --- a/tools/docker-pugs.sh +++ b/tools/docker-pugs.sh @@ -35,7 +35,7 @@ mkdir -p ${DOCKERFILE_DIR} DOCKERFILE="${DOCKERFILE_DIR}/Dockerfile" cat > ${DOCKERFILE} <<EOF -FROM ubuntu:focal +FROM ubuntu:jammy ARG DEBIAN_FRONTEND=noninteractive ENV USER="${USER}" USER_ID="${USER_ID}" USER_GID="${USER_GID}" HOSTNAME="${DOCKER_HOSTNAME}" @@ -46,7 +46,7 @@ RUN useradd --uid "${USER_ID}" --gid "${USER_GID}" --create-home --shell /bin/ba RUN apt-get update && apt-get -y upgrade && apt-get -y remove g++ gcc && apt-get -y install apt-utils gnupg gnupg2 gnupg1 wget cmake git make lcov bc pkg-config sudo doxygen -RUN apt-get -y install clang-10 clang-format-10 +RUN apt-get -y install clang-11 clang-format-11 RUN apt-get -y install libparmetis-dev petsc-dev slepc-dev RUN apt-get clean @@ -54,9 +54,9 @@ RUN apt-get clean RUN rm /usr/bin/cc RUN echo "${USER} ALL=(ALL:ALL) NOPASSWD:ALL" > "/etc/sudoers.d/${USER}" -RUN ln -s /usr/bin/clang-format-10 /usr/bin/clang-format +RUN ln -s /usr/bin/clang-format-11 /usr/bin/clang-format -ENV CC="clang-10" CXX="clang++-10" +ENV CC="clang-11" CXX="clang++-11" EOF -- GitLab