X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a39a45af5e19dfb8b8ed2cb084b3a6b518d179e4..HEAD:/tools/docker/Makefile

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index e189fc9cb4..10b18ceaea 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -4,44 +4,72 @@ default:
 	@echo "   make stable     -> build the latest stable version of SimGrid (with SMPI w/o MC)"
 	@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 tuto-mc
+
 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/'` ;\
-	echo URL:$${url} ; \
+	# docker build -f Dockerfile.stable --build-arg DLURL=/simgrid/simgrid/-/archive/v3.28/simgrid-v3.28.tar.gz -t simgrid/stable:latest -t simgrid/stable:v3.25 . |tee stable.log
+	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/<.*//'); \
+ 	echo "DLURL=/simgrid/simgrid/-/archive/$${last_tag}/simgrid-$${last_tag}.tar.gz";\
 	docker build -f Dockerfile.stable \
-	         --build-arg DLURL=$${url} \
-	         -t simgrid/stable:latest \
+	         --build-arg DLURL=/simgrid/simgrid/-/archive/$${last_tag}/simgrid-$${last_tag}.tar.gz \
+		 -t simgrid/stable:latest \
                  -t simgrid/stable:$${last_tag} \
 		 $(DOCKER_EXTRA) \
-                 . | tee > stable.log
+                 . | tee stable.log
 
 unstable:
 	docker build -f Dockerfile.unstable \
 	         -t simgrid/unstable:latest \
                  -t simgrid/unstable:$$(date --iso-8601) \
 		 $(DOCKER_EXTRA) \
-                 . | tee > unstable.log
+                 . | tee unstable.log
 
 build-deps:
 	docker build -f Dockerfile.build-deps \
 	         -t simgrid/build-deps:latest \
                  -t simgrid/build-deps:$$(date --iso-8601) \
 		 $(DOCKER_EXTRA) \
-                 . | tee > build-deps.log
+                 . | 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
 
-tuto-s4u: 
+build-deps-stable:
+	docker build -f Dockerfile.build-deps-stable \
+	         -t simgrid/build-deps-stable:latest \
+                 -t simgrid/build-deps-stable:$$(date --iso-8601) \
+		 $(DOCKER_EXTRA) \
+                 . | tee build-deps-stable.log
+
+tuto-s4u:
 	docker build -f Dockerfile.tuto-s4u \
 	         -t simgrid/tuto-s4u:latest \
                  -t simgrid/tuto-s4u:$$(date --iso-8601) \
 		 $(DOCKER_EXTRA) \
-                 . | tee > tuto.log
+                 . | tee tuto-s4u.log
+
+tuto-smpi:
+	docker build -f Dockerfile.tuto-smpi \
+	         -t simgrid/tuto-smpi:latest \
+                 -t simgrid/tuto-smpi:$$(date --iso-8601) \
+		 $(DOCKER_EXTRA) \
+                 . | tee tuto-smpi.log
 
 push:
-	docker push simgrid/build-deps
-	docker push simgrid/stable
-	docker push simgrid/unstable
-	docker push simgrid/tuto-s4u
+	docker push --all-tags simgrid/build-deps
+	docker push --all-tags simgrid/stable
+	docker push --all-tags simgrid/unstable
+	docker push --all-tags simgrid/tuto-s4u
+	docker push --all-tags simgrid/tuto-smpi
+	docker push --all-tags simgrid/tuto-mc