diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full index 6268af2eb122d3f454fcc6d3f0e74a50f4dfd07a..c2dd455a821df7a6062b0d7b6018d3008fda889f 100644 --- a/scripts/docker/Dockerfile.clang.full +++ b/scripts/docker/Dockerfile.clang.full @@ -39,15 +39,15 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install virtualenv -# CMake version 3.13.4 +RUN pip3 install virtualenv pre-commit +# CMake version 3.12.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 mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh && \ + /bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ + rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh 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 && \ @@ -66,6 +66,15 @@ RUN apt-get update && \ mkdir -p /apps /scratch /lustre /work /projects /data # Package manager Conan building block +RUN apt-get update -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + pkg-config && \ + rm -rf /var/lib/apt/lists/* +RUN apt-get update -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + autoconf-archive \ + libtool && \ + rm -rf /var/lib/apt/lists/* # pip RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -73,12 +82,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.17.0 +RUN pip3 install conan==1.18.0 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.17.0 + org.opengeosys.pm.conan.version=1.18.0 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # Include-what-you-use for clang version 7 @@ -108,16 +117,12 @@ ENV CCACHE_DIR=/opt/cache \ 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 apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ openssh-client \ - rsync && \ + rsync \ + sudo && \ rm -rf /var/lib/apt/lists/* RUN groupadd --gid 1001 jenkins || true && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index 52b786901d6682842f118d48c725b65c7a8fc46b..d02dbc53cb060454b05bce3ab5a4d30f28d7d063 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -32,15 +32,15 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install virtualenv -# CMake version 3.13.4 +RUN pip3 install virtualenv pre-commit +# CMake version 3.12.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 mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh && \ + /bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ + rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh 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 && \ @@ -59,6 +59,15 @@ RUN apt-get update && \ mkdir -p /apps /scratch /lustre /work /projects /data # Package manager Conan building block +RUN apt-get update -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + pkg-config && \ + rm -rf /var/lib/apt/lists/* +RUN apt-get update -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + autoconf-archive \ + libtool && \ + rm -rf /var/lib/apt/lists/* # pip RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -66,12 +75,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.17.0 +RUN pip3 install conan==1.18.0 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.17.0 + org.opengeosys.pm.conan.version=1.18.0 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # cppcheck version 1.87 @@ -111,16 +120,12 @@ ENV CCACHE_DIR=/opt/cache \ 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 apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ openssh-client \ - rsync && \ + rsync \ + sudo && \ rm -rf /var/lib/apt/lists/* RUN groupadd --gid 1001 jenkins || true && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \ diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui index 32f2b16e04ff7278bb7346f8e8e7ccd33427e274..f40c63b2dc733179eb59d7a0771c352834971888 100644 --- a/scripts/docker/Dockerfile.gcc.gui +++ b/scripts/docker/Dockerfile.gcc.gui @@ -32,15 +32,15 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install virtualenv -# CMake version 3.13.4 +RUN pip3 install virtualenv pre-commit +# CMake version 3.12.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 mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh && \ + /bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ + rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh 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 && \ @@ -67,6 +67,15 @@ RUN apt-get update -y && \ rm -rf /var/lib/apt/lists/* # Package manager Conan building block +RUN apt-get update -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + pkg-config && \ + rm -rf /var/lib/apt/lists/* +RUN apt-get update -y && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ + autoconf-archive \ + libtool && \ + rm -rf /var/lib/apt/lists/* # pip RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -74,12 +83,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.17.0 +RUN pip3 install conan==1.18.0 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.17.0 + org.opengeosys.pm.conan.version=1.18.0 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # cppcheck version 1.87 @@ -112,16 +121,12 @@ ENV CCACHE_DIR=/opt/cache \ LABEL ccache.dir=/opt/cache \ ccache.size=15G -RUN apt-get update -y && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - sudo pkg-config && \ - rm -rf /var/lib/apt/lists/* - # Jenkins node RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ openssh-client \ - rsync && \ + rsync \ + sudo && \ rm -rf /var/lib/apt/lists/* RUN groupadd --gid 1001 jenkins || true && \ adduser --uid 500 --gid 1001 --disabled-password --gecos "" jenkins && \