Skip to content
Snippets Groups Projects
Commit 0dae74fa authored by Lars Bilke's avatar Lars Bilke
Browse files

[Jenkins] Updated Dockerfiles (bumped Conan).

parent f9f54951
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/cmake/ConanSetup.cmake
+ 1
− 1
View file @ 0dae74fa
...@@ -92,7 +92,7 @@ if(OGS_USE_NETCDF) ...@@ -92,7 +92,7 @@ if(OGS_USE_NETCDF)
set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1@bilke/testing) set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1@bilke/testing)
endif() endif()
conan_check(VERSION 1.19.2) conan_check(VERSION 1.20.0)
message(STATUS "Third-party libraries:") message(STATUS "Third-party libraries:")
foreach(LIB ${OGS_LIBS}) foreach(LIB ${OGS_LIBS})
......
scripts/docker/Dockerfile.clang.full
+ 9
− 5
View file @ 0dae74fa
...@@ -31,8 +31,10 @@ RUN apt-get update -y && \ ...@@ -31,8 +31,10 @@ RUN apt-get update -y && \
wget && \ wget && \
rm -rf /var/lib/apt/lists/* 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.12/cmake-3.12.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 && \
mkdir -p /usr/local && \
/bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ /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 rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh
ENV PATH=/usr/local/bin:$PATH
# OGS base building block # OGS base building block
# Python # Python
...@@ -84,12 +86,12 @@ RUN apt-get update -y && \ ...@@ -84,12 +86,12 @@ RUN apt-get update -y && \
python3-setuptools \ python3-setuptools \
python3-wheel && \ python3-wheel && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.19.2 RUN pip3 install conan==1.20.5
RUN mkdir -p /opt/conan && \ RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.19.2 org.opengeosys.pm.conan.version=1.20.5
LABEL org.opengeosys.pm.conan.user_home=/opt/conan LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# Include-what-you-use for clang version 8 # Include-what-you-use for clang version 8
...@@ -100,11 +102,13 @@ RUN apt-get update -y && \ ...@@ -100,11 +102,13 @@ RUN apt-get update -y && \
llvm-8-dev \ llvm-8-dev \
zlib1g-dev && \ zlib1g-dev && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
# https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz && \ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/clang_8.0.tar.gz -C /var/tmp -z && \ mkdir -p /var/tmp && tar -x -f /var/tmp/clang_8.0.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/iwyy -DIWYU_LLVM_ROOT_PATH=/usr/lib/llvm-8 /var/tmp/include-what-you-use-clang_8.0 && \ mkdir -p /var/tmp/include-what-you-use-clang_8.0/build && cd /var/tmp/include-what-you-use-clang_8.0/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/iwyy -D IWYU_LLVM_ROOT_PATH=/usr/lib/llvm-8 /var/tmp/include-what-you-use-clang_8.0 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \ cmake --build /var/tmp/include-what-you-use-clang_8.0/build --target all -- -j$(nproc) && \
rm -rf /var/tmp/clang_8.0.tar.gz /var/tmp/build /var/tmp/include-what-you-use-clang_8.0 cmake --build /var/tmp/include-what-you-use-clang_8.0/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/clang_8.0.tar.gz /var/tmp/include-what-you-use-clang_8.0
ENV PATH=/usr/local/iwyy/bin:$PATH ENV PATH=/usr/local/iwyy/bin:$PATH
# Package manager Conan building block # Package manager Conan building block
......
scripts/docker/Dockerfile.gcc.full
+ 9
− 5
View file @ 0dae74fa
...@@ -24,8 +24,10 @@ RUN apt-get update -y && \ ...@@ -24,8 +24,10 @@ RUN apt-get update -y && \
wget && \ wget && \
rm -rf /var/lib/apt/lists/* 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.12/cmake-3.12.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 && \
mkdir -p /usr/local && \
/bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ /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 rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh
ENV PATH=/usr/local/bin:$PATH
# OGS base building block # OGS base building block
# Python # Python
...@@ -77,20 +79,22 @@ RUN apt-get update -y && \ ...@@ -77,20 +79,22 @@ RUN apt-get update -y && \
python3-setuptools \ python3-setuptools \
python3-wheel && \ python3-wheel && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.19.2 RUN pip3 install conan==1.20.5
RUN mkdir -p /opt/conan && \ RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.19.2 org.opengeosys.pm.conan.version=1.20.5
LABEL org.opengeosys.pm.conan.user_home=/opt/conan LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87 # cppcheck version 1.87
# https://github.com/danmar/cppcheck/archive/1.87.tar.gz
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \ mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \ mkdir -p /var/tmp/cppcheck-1.87/build && cd /var/tmp/cppcheck-1.87/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -D CMAKE_BUILD_TYPE=Release /var/tmp/cppcheck-1.87 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \ cmake --build /var/tmp/cppcheck-1.87/build --target all -- -j$(nproc) && \
rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87 cmake --build /var/tmp/cppcheck-1.87/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/1.87.tar.gz /var/tmp/cppcheck-1.87
ENV PATH=/usr/local/cppcheck/bin:$PATH ENV PATH=/usr/local/cppcheck/bin:$PATH
RUN apt-get update -y && \ RUN apt-get update -y && \
......
scripts/docker/Dockerfile.gcc.gui
+ 9
− 5
View file @ 0dae74fa
...@@ -24,8 +24,10 @@ RUN apt-get update -y && \ ...@@ -24,8 +24,10 @@ RUN apt-get update -y && \
wget && \ wget && \
rm -rf /var/lib/apt/lists/* 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.12/cmake-3.12.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 && \
mkdir -p /usr/local && \
/bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ /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 rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh
ENV PATH=/usr/local/bin:$PATH
# OGS base building block # OGS base building block
# Python # Python
...@@ -85,20 +87,22 @@ RUN apt-get update -y && \ ...@@ -85,20 +87,22 @@ RUN apt-get update -y && \
python3-setuptools \ python3-setuptools \
python3-wheel && \ python3-wheel && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN pip3 install conan==1.19.2 RUN pip3 install conan==1.20.5
RUN mkdir -p /opt/conan && \ RUN mkdir -p /opt/conan && \
chmod 777 /opt/conan chmod 777 /opt/conan
ENV CONAN_USER_HOME=/opt/conan ENV CONAN_USER_HOME=/opt/conan
LABEL org.opengeosys.pm=conan \ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.19.2 org.opengeosys.pm.conan.version=1.20.5
LABEL org.opengeosys.pm.conan.user_home=/opt/conan LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# cppcheck version 1.87 # cppcheck version 1.87
# https://github.com/danmar/cppcheck/archive/1.87.tar.gz
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \ mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \ mkdir -p /var/tmp/cppcheck-1.87/build && cd /var/tmp/cppcheck-1.87/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -D CMAKE_BUILD_TYPE=Release /var/tmp/cppcheck-1.87 && \
cmake --build /var/tmp/build --target install -- -j$(nproc) && \ cmake --build /var/tmp/cppcheck-1.87/build --target all -- -j$(nproc) && \
rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87 cmake --build /var/tmp/cppcheck-1.87/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/1.87.tar.gz /var/tmp/cppcheck-1.87
ENV PATH=/usr/local/cppcheck/bin:$PATH ENV PATH=/usr/local/cppcheck/bin:$PATH
# pip # pip
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment