-# 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 update && apt install -y pajeng r-base r-cran-ggplot2 r-cran-dplyr cmake g++ git libboost-all-dev&& \
+# - 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 && \
- apt autoremove -y && apt clean && apt autoclean
\ No newline at end of file
+ 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');"
+
+CMD ["/bin/bash"]
