From 2df5e22ff1bb498a851a5243c6ff542780d6970d Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 2 Apr 2020 08:57:20 +0200
Subject: [PATCH] [Docker] Bumped base image to 19.10 to get gcc 9.
---
ThirdParty/container-maker | 2 +-
scripts/docker/Dockerfile.clang.full | 17 ++++++++---------
scripts/docker/Dockerfile.gcc.full | 4 ++--
scripts/docker/Dockerfile.gcc.gui | 21 +++++++++++++++++++--
4 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 151e6d47c27..763b2642a5c 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 151e6d47c27ea637aad99165ba0558d244cbdd35
+Subproject commit 763b2642a5c850a4d5b3cdc910962985c847239c
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index 6bf918e8989..1e6251098fc 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -2,7 +2,7 @@
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 && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -15,16 +15,15 @@ RUN apt-get update -y && \
# LLVM compiler
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
- 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-9 \
clang-format-9 \
- clang-tidy-9 && \
+ clang-tidy-9 \
+ libomp-dev && \
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
RUN apt-get update -y && \
diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full
index 6dd63f23eef..3c663b19609 100644
--- a/scripts/docker/Dockerfile.gcc.full
+++ b/scripts/docker/Dockerfile.gcc.full
@@ -1,8 +1,8 @@
# 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 && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui
index 7e5b089000b..0eeee444a61 100644
--- a/scripts/docker/Dockerfile.gcc.gui
+++ b/scripts/docker/Dockerfile.gcc.gui
@@ -1,8 +1,8 @@
# 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 && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -104,6 +104,16 @@ LABEL org.opengeosys.pm=conan \
org.opengeosys.pm.conan.version=1.22.2
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
# 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://
rm -rf /var/tmp/cppcheck-1.87 /var/tmp/1.87.tar.gz
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
RUN apt-get update -y && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
--
GitLab