diff --git a/tools/docker-pugs.sh b/tools/docker-pugs.sh index af54df67c963f16e3d3931aeaeba66b536da3d7a..1f21bbcee2e0f1f24854b453fa91ab4e703e13d4 100755 --- a/tools/docker-pugs.sh +++ b/tools/docker-pugs.sh @@ -35,30 +35,28 @@ mkdir -p ${DOCKERFILE_DIR} DOCKERFILE="${DOCKERFILE_DIR}/Dockerfile" cat > ${DOCKERFILE} <<EOF -FROM ubuntu:bionic +FROM ubuntu:focal +ARG DEBIAN_FRONTEND=noninteractive ENV USER="${USER}" USER_ID="${USER_ID}" USER_GID="${USER_GID}" HOSTNAME="${DOCKER_HOSTNAME}" - +ENV TZ=Europe/Paris RUN echo "${DOCKER_HOSTNAME}" > /etc/hostname RUN groupadd --gid "${USER_GID}" "${USER}" RUN useradd --uid "${USER_ID}" --gid "${USER_GID}" --create-home --shell /bin/bash "${USER}" -RUN apt-get update && apt-get -y upgrade && apt-get -y remove g++ gcc && apt-get -y install cmake git make lcov bc gnupg gnupg2 gnupg1 wget - -RUN echo 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main' > /etc/apt/sources.list.d/backports.list -RUN wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - +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 -RUN apt-get update && apt-get -y upgrade && apt-get -y install clang-8 clang-tools-8 clang-8-doc libclang-common-8-dev libclang-8-dev libclang1-8 clang-format-8 python-clang-8 +RUN apt-get -y install clang-10 -RUN apt-get -y install libparmetis-dev sudo +RUN apt-get -y install libparmetis-dev petsc-dev slepc-dev 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-8 /usr/bin/clang-format +RUN ln -s /usr/bin/clang-format-10 /usr/bin/clang-format -ENV CC="clang-8" CXX="clang++-8" +ENV CC="clang-10" CXX="clang++-10" EOF