diff --git a/Jenkinsfile b/Jenkinsfile index bdf48fa2a7e624d2db49b93ce06dfdec134a0777..0988bfaada213c3b1e894747c88c98352a757241 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -657,7 +657,7 @@ pipeline { } agent { dockerfile { - filename 'Dockerfile.clang.minimal' + filename 'Dockerfile.clang.full' dir 'scripts/docker' label 'docker' args '-v /home/jenkins/cache/ccache:/opt/ccache -v /home/jenkins/cache/conan/.conan:/opt/conan/.conan' diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal deleted file mode 100644 index 48cf2d2d90f36b17fe01397e7c0211d7db0cf830..0000000000000000000000000000000000000000 --- a/scripts/docker/Dockerfile.clang.minimal +++ /dev/null @@ -1,111 +0,0 @@ -FROM ubuntu:18.04 - -# Generated with https://github.com/ufz/ogs-container-maker/commit/cb0c25d - -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - wget \ - tar \ - curl && \ - rm -rf /var/lib/apt/lists/* - -# LLVM compiler -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - clang-7 && \ - rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/clang clang $(which clang-7) 30 && \ - update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-7) 30 - -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - clang-tidy-7 \ - clang-format-7 && \ - rm -rf /var/lib/apt/lists/* - -# OGS base building block -# Python -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3 \ - libpython3-dev && \ - rm -rf /var/lib/apt/lists/* -# pip -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ - rm -rf /var/lib/apt/lists/* -RUN pip3 install --upgrade pip -# pip -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ - rm -rf /var/lib/apt/lists/* -RUN pip3 install virtualenv -# CMake version 3.13.4 -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - wget && \ - rm -rf /var/lib/apt/lists/* -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \ - /bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ - rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh -RUN apt-get update && \ - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \ - apt-add-repository ppa:git-core/ppa -y && \ - apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - git \ - git-lfs \ - make \ - ninja-build && \ - rm -rf /var/lib/apt/lists/* -RUN git lfs install && \ - mkdir -p /apps /scratch /lustre /work /projects - -# Package manager Conan building block -# pip -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - python3-pip \ - python3-setuptools \ - python3-wheel && \ - rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.12.2 -RUN mkdir -p /opt/conan && \ - chmod 777 /opt/conan -ENV CONAN_USER_HOME=/opt/conan -LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.user_home=/opt/conan \ - org.opengeosys.pm.conan.version=1.12.2 - -# Package manager Conan building block -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - ccache && \ - rm -rf /var/lib/apt/lists/* -RUN mkdir -p /opt/cache && chmod 777 /opt/cache -ENV CCACHE_DIR=/opt/cache \ - CCACHE_MAXSIZE=15G \ - CCACHE_SLOPPINESS=pch_defines,time_macros -LABEL ccache.dir=/opt/cache \ - ccache.size=15G - -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - sudo && \ - rm -rf /var/lib/apt/lists/* - -# Jenkins node -RUN groupadd --gid 1001 jenkins && \ - adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ - echo "jenkins ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ - echo "jenkins:jenkins" | chpasswd -USER jenkins -WORKDIR /home/jenkins