Toolchain: Switch mostly to Ubuntu 20.04

cp2k · Aug 2, 2020 · fd9a017 · fd9a017
1 parent 729dd9a
commit fd9a017
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE=ubuntu:18.04
+ARG BASE_IMAGE=ubuntu:20.04
 FROM ${BASE_IMAGE}
 
 ARG MPI_MODE=mpich

diff --git a/tools/toolchain/Dockerfile.ubuntu_nompi b/tools/toolchain/Dockerfile.ubuntu_nompi
@@ -1,5 +1,6 @@
-FROM ubuntu:18.04
-ARG GCC_VERSION=8
+ARG BASE_IMAGE=ubuntu:20.04
+FROM ${BASE_IMAGE}
+ARG GCC_VERSION=9
 ARG LIBINT_LMAX=5
 USER root
 
@@ -8,7 +9,8 @@ USER root
 # Installs lean toolchain without MPI and relying mostly on Ubuntu packages.
 
 # Install Ubuntu packages.
-RUN apt-get update -qq && apt-get install -qq --no-install-recommends \
+RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && \
+    apt-get update -qq && apt-get install -qq --no-install-recommends \
     autoconf \
     autogen \
     automake \

diff --git a/tools/toolchain/install_requirements_fedora.sh b/tools/toolchain/install_requirements_fedora.sh
@@ -19,6 +19,7 @@ dnf -qy install                             \
     libtool                                 \
     make                                    \
     nano                                    \
+    patch                                   \
     pkg-config                              \
     python                                  \
     python-numpy                            \

diff --git a/tools/toolchain/install_requirements_ubuntu.sh b/tools/toolchain/install_requirements_ubuntu.sh
@@ -6,6 +6,9 @@
 
 echo "Installing Ubuntu packages..."
 
+export DEBIAN_FRONTEND=noninteractive
+export DEBCONF_NONINTERACTIVE_SEEN=true
+
 apt-get update -qq
 
 apt-get install -qq --no-install-recommends \
@@ -20,6 +23,7 @@ apt-get install -qq --no-install-recommends \
     libtool                                 \
     make                                    \
     nano                                    \
+    patch                                   \
     pkg-config                              \
     python                                  \
     python-numpy                            \