Pleases somewhat codefactor.io, lgtm, and pvs-studio.

[simgrid.git] / docs / source / tuto_disk / Dockerfile

diff --git a/docs/source/tuto_disk/Dockerfile b/docs/source/tuto_disk/Dockerfile
index c496185..5a58b42 100644 (file)
--- a/docs/source/tuto_disk/Dockerfile
+++ b/docs/source/tuto_disk/Dockerfile
@@ -1,30 +1,26 @@
 FROM debian:10.10-slim
 
-RUN echo " \
-    deb    [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian/20210707T150931Z/ buster main contrib non-free \n\
-    deb-src [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian/20210707T150931Z/ buster main contrib non-free \n\
-    deb     [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian-security/20210707T150931Z/ buster/updates main contrib non-free \n\
-    deb-src [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian-security/20210707T150931Z/ buster/updates main contrib non-free" > /etc/apt/sources.list 
-
-RUN    apt-get -o Acquire::Check-Valid-Until=false update;
-
+RUN printf '%s\n' \
+    "deb    [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian/20210707T150931Z/ buster main contrib non-free" \
+    "deb-src [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian/20210707T150931Z/ buster main contrib non-free" \
+    "deb     [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian-security/20210707T150931Z/ buster/updates main contrib non-free" \
+    "deb-src [check-valid-until=no, trusted=yes] http://snapshot.debian.org/archive/debian-security/20210707T150931Z/ buster/updates main contrib non-free" > /etc/apt/sources.list \
+&& \
+    apt-get -o Acquire::Check-Valid-Until=false update \
+&& \
+    apt-get install -y --no-install-recommends \
 # emacs
-RUN apt-get install -y \
     emacs \
     ess \
-    elpa-htmlize
-
+    elpa-htmlize \
 # R
-RUN apt-get install -y \
     r-base-core \
     r-cran-ggplot2 \
     r-cran-dplyr \
     r-cran-plyr \
     r-cran-jsonlite \
-    r-cran-gridextra
-
+    r-cran-gridextra \
 # simgrid dependencies
-RUN apt install -y \
     g++ \
     gcc \
     git \
@@ -33,12 +29,11 @@ RUN apt install -y \
     libboost-dev \
     libboost-all-dev \
     cmake \
-    dpkg-dev
-
-RUN apt-get install -y \
-    curl
-
-RUN apt-get clean \
+    dpkg-dev \
+# misc tools
+    curl \
+&& \
+    apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
 # install ox-rst to convert org to rst