write in my own doc how to regenerate the docker images without having to upload...

+ add python3 on the image of tuto-smpi as smpirun needs it

diff --git a/doc/doxygen/inside_release.doc b/doc/doxygen/inside_release.doc
index 409a58f..7567fd2 100644 (file)
--- a/doc/doxygen/inside_release.doc
+++ b/doc/doxygen/inside_release.doc
@@ -86,9 +86,13 @@ Please apply the following checklist before releasing.
   - edit debian/control: s/simgrid3.XX/simgrid3.XY/ 
 - Update the simgrid/package.py for spack: https://gitlab.inria.fr/solverstack/spack-repo
 - Update the Docker images (after pushing to the git)
-  - cd tools/docker && make stable tuto-s4u tuto-smpi push
-  - Update the simgrid-template-s4u repository to test against this new release once the docker is uploaded
-    jed ~/Code/simgrid-template-s4u/.gitlab-ci.yml
+  - cd tools/docker && make stable.
+    The argument passing is somehow failing, so you'll need to copy/paste + execute manually this line:
+      docker build -f Dockerfile.stable --build-arg DLURL=?????  -t simgrid/stable:latest ...........
+  - Upload the stable docker image once built
+  - Once the new image is uploaded, trigger a rebuild of the images tuto-{s4u,smpi} on https://hub.docker.com
+    They use the dockerfiles in simgrid:tools/docker, and are built upon the simgrid/stable image
+  - Once the new images are built, trigger a rebuild of the simgrid-template-{s4u,smpi} repositories on framagit
 
 @subsection inside_release_c_postrelease Post-release cleanups
 

diff --git a/tools/docker/Dockerfile.tuto-smpi b/tools/docker/Dockerfile.tuto-smpi
index 640620e..2e4f63c 100644 (file)
--- a/tools/docker/Dockerfile.tuto-smpi
+++ b/tools/docker/Dockerfile.tuto-smpi
@@ -12,7 +12,7 @@ RUN apt install -y sudo && \
     chown -R user:user /home/user
 
 # - Clone simgrid-template-smpi, as it is needed by the tutorial
-RUN apt install -y pajeng libssl-dev r-base r-cran-ggplot2 r-cran-dplyr r-cran-devtools build-essential g++ gfortran git libboost-all-dev cmake flex bison && \
+RUN apt install -y python3 pajeng libssl-dev r-base r-cran-ggplot2 r-cran-dplyr r-cran-devtools build-essential g++ gfortran git libboost-all-dev cmake flex bison && \
     cd /source && \
     git clone --depth=1 https://framagit.org/simgrid/simgrid-template-smpi.git simgrid-template-smpi.git && \
     chown -R user:user /source && \