Cleanup Dockerfile a litte bit

Signed-off-by: Nicolas Bock <nicolasbock@gmail.com>
lanl · May 6, 2020 · 3f8f571 · 3f8f571
1 parent 586e9d9
commit 3f8f571
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 26 deletions.
diff --git a/ci-images/build/Dockerfile b/ci-images/build/Dockerfile
@@ -14,12 +14,15 @@ RUN apt-get update
 RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
 RUN apt-get install --assume-yes tzdata
 RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
-RUN apt-get install --assume-yes --no-install-recommends apt-utils
-RUN apt-get install --assume-yes --no-install-recommends build-essential
-RUN apt-get install --assume-yes --no-install-recommends git-core openssh-client ca-certificates
-RUN apt-get install --assume-yes --no-install-recommends cmake cmake-data libblas-dev liblapack-dev
-RUN apt-get install --assume-yes --no-install-recommends gcc-4.7 g++-4.7 gfortran-4.7
-RUN apt-get install --assume-yes --no-install-recommends gcc-9 g++-9 gfortran-9
-RUN apt-get install --assume-yes --no-install-recommends clang-9 libomp-9-dev
-RUN apt-get install --assume-yes --no-install-recommends python
-RUN apt-get install --assume-yes --no-install-recommends valgrind
+
+RUN apt-get install --assume-yes --no-install-recommends \
+        apt-utils \
+        build-essential \
+        clang-9 llvm-9-dev libomp-9-dev \
+        cmake cmake-data \
+        gcc-4.7 g++-4.7 gfortran-4.7 \
+        gcc-9 g++-9 gfortran-9 \
+        git-core openssh-client \
+        libblas-dev liblapack-dev \
+        python \
+        valgrind
diff --git a/ci-images/docs/Dockerfile b/ci-images/docs/Dockerfile
@@ -7,11 +7,14 @@ RUN apt-get update
 RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
 RUN apt-get install --assume-yes tzdata
 RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
-RUN apt-get install --assume-yes --no-install-recommends apt-utils
-RUN apt-get install --assume-yes --no-install-recommends ca-certificates
-RUN apt-get install --assume-yes --no-install-recommends build-essential
-RUN apt-get install --assume-yes --no-install-recommends git-core openssh-client
-RUN apt-get install --assume-yes --no-install-recommends cmake cmake-data libblas-dev liblapack-dev
-RUN apt-get install --assume-yes --no-install-recommends gfortran
-RUN apt-get install --assume-yes --no-install-recommends doxygen
-RUN apt-get install --assume-yes --no-install-recommends texlive
+
+RUN apt-get install --assume-yes --no-install-recommends \
+        apt-utils \
+        build-essential \
+        cmake cmake-data \
+        doxygen \
+        gfortran \
+        git-core \
+        libblas-dev liblapack-dev \
+        openssh-client \
+        texlive
diff --git a/ci-images/lint/Dockerfile b/ci-images/lint/Dockerfile
@@ -7,13 +7,16 @@ RUN apt-get update
 RUN ln -fs /usr/share/zoneinfo/UTC /etc/localtime
 RUN apt-get install --assume-yes tzdata
 RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure --frontend noninteractive tzdata
-RUN apt-get install --assume-yes --no-install-recommends apt-utils
-RUN apt-get install --assume-yes --no-install-recommends ca-certificates
-RUN apt-get install --assume-yes --no-install-recommends git-core openssh-client
-RUN apt-get install --assume-yes --no-install-recommends bundler
-RUN apt-get install --assume-yes --no-install-recommends emacs26
-RUN apt-get install --assume-yes --no-install-recommends indent
-RUN apt-get install --assume-yes --no-install-recommends python-pip
-RUN apt-get install --assume-yes --no-install-recommends python-setuptools
-RUN apt-get install --assume-yes --no-install-recommends python-wheel
+
+RUN apt-get install --assume-yes --no-install-recommends \
+        apt-utils \
+        bundler \
+        emacs26 \
+        git-core \
+        indent \
+        openssh-client \
+        python-pip \
+        python-setuptools \
+        python-wheel
+
 RUN pip install proselint