X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef8a061a80df38ceeeddfa8200111035ba8537ce..f973433226af2e2e3059b62578bb0f3b215380fb:/docs/source/tuto_disk/Dockerfile

diff --git a/docs/source/tuto_disk/Dockerfile b/docs/source/tuto_disk/Dockerfile
index c496185675..582d016b98 100644
--- 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
-
-# simgrid dependencies
-RUN apt install -y \
+    r-cran-gridextra \
+# SimGrid dependencies
     g++ \
     gcc \
     git \
@@ -32,26 +28,26 @@ RUN apt install -y \
     gfortran \
     libboost-dev \
     libboost-all-dev \
+    libeigen3-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
 RUN mkdir /source && cd /source && \
     git clone https://github.com/msnoigrs/ox-rst.git ox-rst.git
 
-# compile install simgrid
+# compile install SimGrid
 RUN cd /source && git clone --depth=1 https://framagit.org/simgrid/simgrid.git simgrid.git && \
     cd simgrid.git && \
     cmake -DCMAKE_INSTALL_PREFIX=/usr/ -Denable_documentation=OFF -Denable_smpi=ON -Denable_compile_optimizations=ON . && \
     make -j4 install
 
-## compile 
+## compile
 RUN cd /source/simgrid.git/docs/source/tuto_disk && \
     cmake . &&\
     make