X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/353e4c084db3c0a55663e4121ca20112b44de6d4..2a07cc1dc95048c86a3fc76aca2e9c088f7b5025:/tools/docker/Makefile

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index b82cfc725e..9d6fbd627d 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -5,13 +5,17 @@ default:
 	@echo "   make unstable   -> build the git version of SimGrid (with SMPI, w/o MC)"
 	@echo "   make tuto-s4u   -> build all what you need to take the S4U tutorial"
 	@echo "   make tuto-smpi  -> build all what you need to take the SMPI tutorial"
+	@echo "   make tuto-mc    -> build the git version of SimGrid (with SMPI and MC)"
+	@echo "   make all        -> build all but stable (ie, build-deps unstable tuto-s4u tuto-smpi)"
 	@echo "   make push       -> push all images to the cloud"
 	@echo "All our images are based on debian:testing"
 	@echo "Also possible: DOCKER_EXTRA=--no-cache make unstable"
 
+all: build-deps unstable tuto-s4u tuto-smpi
+
 stable:
 	export last_tag=`wget https://framagit.org/simgrid/simgrid/tags 2>/dev/null -O - | grep /simgrid/simgrid/tags/v | head -n1  | sed 's/[^>]*>//' | sed 's/<.*//'`; \
-	export url=`wget https://framagit.org/simgrid/simgrid/tags/$${last_tag} 2>/dev/null -O - | grep SimGrid- | perl -pe 's/.*?<li><a href="//' | sed 's/tar.gz.*/tar.gz/'` ;\
+	export url=`wget https://framagit.org/simgrid/simgrid/tags/$${last_tag} 2>/dev/null -O - | grep SimGrid- | perl -pe 's/.*?<a href="//' | sed 's/tar.gz.*/tar.gz/'` ;\
 	echo URL:$${url} ; \
 	docker build -f Dockerfile.stable \
 	         --build-arg DLURL=$${url} \
@@ -34,6 +38,13 @@ build-deps:
 		 $(DOCKER_EXTRA) \
                  . | tee > build-deps.log
 
+tuto-mc:
+	docker build -f Dockerfile.tuto-mc \
+	         -t simgrid/tuto-mc:latest \
+                 -t simgrid/tuto-mc:$$(date --iso-8601) \
+		 $(DOCKER_EXTRA) \
+                 . | tee > tuto-mc.log
+
 build-deps-stable:
 	docker build -f Dockerfile.build-deps-stable \
 	         -t simgrid/build-deps-stable:latest \
@@ -61,3 +72,4 @@ push:
 	docker push simgrid/unstable
 	docker push simgrid/tuto-s4u
 	docker push simgrid/tuto-smpi
+	docker push simgrid/tuto-mc