Docker: Move installation of Ubuntu packages into toolchain image

cp2k · Mar 21, 2019 · 4eedcde · 4eedcde
1 parent 5449f45
commit 4eedcde
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 31 deletions.
diff --git a/tools/docker/scripts/install_basics.sh b/tools/docker/scripts/install_basics.sh
@@ -2,21 +2,6 @@
 
 # author: Ole Schuett
 
-# install Ubuntu packages
-apt-get update
-apt-get install -y --no-install-recommends \
-    ca-certificates                        \
-    python                                 \
-    git                                    \
-    nano                                   \
-    wget                                   \
-    unzip                                  \
-    less                                   \
-    make                                   \
-    cmake                                  \
-    rsync
-rm -rf /var/lib/apt/lists/*
-
 # clone cp2k repository
 git clone --recursive --depth=1 --single-branch -b master https://github.com/cp2k/cp2k.git /workspace/cp2k
 

diff --git a/tools/toolchain/Dockerfile b/tools/toolchain/Dockerfile
@@ -2,36 +2,39 @@ FROM ubuntu:18.04
 USER root
 
 # install Ubuntu packages
+# Include also packages for the CI to make check_runs similar to full toolchain builds.
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    ca-certificates \
-    gfortran \
-    python \
-    wget \
+    autoconf \
+    autogen \
+    automake \
+    autotools-dev \
     bison \
     bisonc++ \
+    build-essential \
+    ca-certificates \
+    cmake \
     flex \
     flexc++ \
-    zlib1g-dev \
+    gfortran \
+    git \
     less \
-    unzip \
     libc6-dbg \
-    autotools-dev \
-    autogen \
     libtool \
-    autoconf \
-    automake \
+    make \
+    nano \
     pkg-config \
+    python \
+    rsync \
+    unzip \
+    wget \
+    zlib1g-dev \
    && rm -rf /var/lib/apt/lists/*
 
 # build toolchain
 WORKDIR /opt/cp2k-toolchain
 COPY . /opt/cp2k-toolchain
-
-# Do not compile make until glibc issue is resolved:
-#  http://gnu-make.2324884.n4.nabble.com/undefined-reference-to-alloca-td18308.html
-#  http://git.savannah.gnu.org/cgit/make.git/commit/?id=48c8a116a914a325a0497721f5d8b58d5bba34d4
-RUN ./install_cp2k_toolchain.sh --install-all --with-make=no && rm -rf ./build
+RUN ./install_cp2k_toolchain.sh --install-all --with-binutils=system --with-cmake=system --with-make=system \
+    && rm -rf ./build
 
 # configure shell
 RUN ln -sf bash /bin/sh && \