Skip to content
Snippets Groups Projects
Verified Commit 2df5e22f authored by Lars Bilke's avatar Lars Bilke
Browse files

[Docker] Bumped base image to 19.10 to get gcc 9.

parent 74479724
No related branches found
No related tags found
No related merge requests found
Subproject commit 151e6d47c27ea637aad99165ba0558d244cbdd35 Subproject commit 763b2642a5c850a4d5b3cdc910962985c847239c
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
FROM ubuntu:18.04 AS build FROM ubuntu:18.04 AS build
# Generated with ogs-container-maker 1.2.0 # Generated with ogs-container-maker 1.4.3
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
...@@ -15,16 +15,15 @@ RUN apt-get update -y && \ ...@@ -15,16 +15,15 @@ RUN apt-get update -y && \
# LLVM compiler # LLVM compiler
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
clang-9 && \ clang-9 \
rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/clang clang $(which clang-9) 30 && \
update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-9) 30
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
clang-format-9 \ clang-format-9 \
clang-tidy-9 && \ clang-tidy-9 \
libomp-dev && \
rm -rf /var/lib/apt/lists/* rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/clang clang $(which clang-9) 30 && \
update-alternatives --install /usr/bin/clang++ clang++ $(which clang++-9) 30 && \
update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-9) 30 && \
update-alternatives --install /usr/bin/clang-tidy clang-tidy $(which clang-tidy-9) 30
# pip # pip
RUN apt-get update -y && \ RUN apt-get update -y && \
......
# syntax=docker/dockerfile:experimental # syntax=docker/dockerfile:experimental
FROM ubuntu:19.04 AS build FROM ubuntu:19.10 AS build
# Generated with ogs-container-maker 1.2.0 # Generated with ogs-container-maker 1.4.3
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......
# syntax=docker/dockerfile:experimental # syntax=docker/dockerfile:experimental
FROM ubuntu:19.04 AS build FROM ubuntu:19.10 AS build
# Generated with ogs-container-maker 1.2.0 # Generated with ogs-container-maker 1.4.3
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
...@@ -104,6 +104,16 @@ LABEL org.opengeosys.pm=conan \ ...@@ -104,6 +104,16 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.22.2 org.opengeosys.pm.conan.version=1.22.2
LABEL org.opengeosys.pm.conan.user_home=/opt/conan LABEL org.opengeosys.pm.conan.user_home=/opt/conan
# CVode version 2.8.2
# https://github.com/ufz/cvode/archive/2.8.2.tar.gz
RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/ufz/cvode/archive/2.8.2.tar.gz && \
mkdir -p /var/tmp && tar -x -f /var/tmp/2.8.2.tar.gz -C /var/tmp -z && \
mkdir -p /var/tmp/cvode-2.8.2/build && cd /var/tmp/cvode-2.8.2/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cvode -D CMAKE_INSTALL_PREFIX=/usr/local/cvode -D EXAMPLES_INSTALL=OFF -D BUILD_SHARED_LIBS=OFF -D CMAKE_POSITION_INDEPENDENT_CODE=ON /var/tmp/cvode-2.8.2 && \
cmake --build /var/tmp/cvode-2.8.2/build --target all -- -j$(nproc) && \
cmake --build /var/tmp/cvode-2.8.2/build --target install -- -j$(nproc) && \
rm -rf /var/tmp/cvode-2.8.2 /var/tmp/2.8.2.tar.gz
ENV CVODE_ROOT=/usr/local/cvode
# cppcheck version 1.87 # cppcheck version 1.87
# https://github.com/danmar/cppcheck/archive/1.87.tar.gz # 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 && \
...@@ -114,6 +124,13 @@ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https:// ...@@ -114,6 +124,13 @@ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://
rm -rf /var/tmp/cppcheck-1.87 /var/tmp/1.87.tar.gz rm -rf /var/tmp/cppcheck-1.87 /var/tmp/1.87.tar.gz
ENV PATH=/usr/local/cppcheck/bin:$PATH ENV PATH=/usr/local/cppcheck/bin:$PATH
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
doxygen \
graphviz \
texlive-base && \
rm -rf /var/lib/apt/lists/*
# pip # pip
RUN apt-get update -y && \ RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment