X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45f06afb0fe809e300f707ae1f94feb81d73ff03..d68e1c39ec0832cb2391aedd17a868c597dd399e:/tools/docker/Dockerfile.tuto-s4u

diff --git a/tools/docker/Dockerfile.tuto-s4u b/tools/docker/Dockerfile.tuto-s4u
index 8bc81e2291..bb4f50ff2e 100644
--- a/tools/docker/Dockerfile.tuto-s4u
+++ b/tools/docker/Dockerfile.tuto-s4u
@@ -1,8 +1,16 @@
-# Base image 
-FROM simgrid/unstable
+# Base image
+FROM simgrid/stable
+
+RUN apt update && apt -y upgrade
 
 # - 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++ && \
-    git clone --depth=1 https://framagit.org/simgrid/simgrid-template-s4u.git
+# - Add an empty makefile advising to run cmake before make, just in case
+RUN apt install -y python-is-python3 pajeng r-base r-cran-tidyverse r-cran-devtools cmake g++ git libboost-dev libeigen3-dev flex bison libfmt-dev && \
+    cd /source && \
+    git clone --depth=1 https://framagit.org/simgrid/simgrid-template-s4u.git simgrid-template-s4u.git && \
+    printf "master-workers ping-pong:\n\t@echo \"Please run the following command before make:\";echo \"    cmake .\"; exit 1" > Makefile && \
+    apt autoremove -y && apt clean && apt autoclean
+
+RUN Rscript -e "library(devtools); install_github('schnorr/pajengr');"
 
-    
\ No newline at end of file
+CMD ["/bin/bash"]