From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 23 Aug 2018 10:58:28 +0000 (+0200)
Subject: docker: further reduce the images' sizes
X-Git-Tag: v3_21~209
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/cc64594ed28e7a31852c8d8772769962ccef377e

docker: further reduce the images' sizes
---

diff --git a/tools/docker/Dockerfile.tuto-s4u b/tools/docker/Dockerfile.tuto-s4u
index e25f1e68d9..777897c4cf 100644
--- a/tools/docker/Dockerfile.tuto-s4u
+++ b/tools/docker/Dockerfile.tuto-s4u
@@ -2,8 +2,7 @@
 FROM simgrid/unstable
 
 # - Clone simgrid-template-s4u, as it is needed by the tutorial
-RUN apt install -y pajeng r-base r-cran-ggplot2 r-cran-dplyr cmake g++ && \
+RUN apt install -y pajeng r-base r-cran-ggplot2 r-cran-dplyr cmake g++ git && \
     cd /src && \
-    git clone --depth=1 https://framagit.org/simgrid/simgrid-template-s4u.git
-
-    
\ No newline at end of file
+    git clone --depth=1 https://framagit.org/simgrid/simgrid-template-s4u.git simgrid-template-s4u.git && \
+    apt autoremove -y && apt clean && apt autoclean
\ No newline at end of file
diff --git a/tools/docker/Dockerfile.unstable b/tools/docker/Dockerfile.unstable
index 692182e29c..0d1c955d6f 100644
--- a/tools/docker/Dockerfile.unstable
+++ b/tools/docker/Dockerfile.unstable
@@ -4,11 +4,11 @@ FROM debian:testing
 # - Install SimGrid's dependencies
 # - Compile and install SimGrid itself
 RUN apt update && \
-    apt install -y g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev libboost-coroutine1.62.0 cmake && \
+    apt install -y g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev cmake libboost-coroutine1.62.0 && \
     mkdir /src/ && cd /src && git clone --depth=1 https://framagit.org/simgrid/simgrid.git simgrid.git && \
     cd simgrid.git && \
     cmake -DCMAKE_INSTALL_PREFIX=/usr/ -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=ON -Denable_compile_optimizations=ON . && \
     make -j4 install && \
     git reset --hard master && git clean -dfx && \
-    apt remove -y default-jdk gfortran libboost-dev libboost-all-dev cmake gdb valgrind && \
+    apt remove -y  g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev cmake gdb && \
     apt autoremove -y && apt autoclean && apt clean