X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18703ff782a3b8687a1a8c4beb2f78b0db00aff2..5edec65e26d76490b9753d8db950a8a2ddf3cb2c:/tools/docker/Makefile

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index 82f2d907e8..10b18ceaea 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -11,15 +11,14 @@ default:
 	@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
+all: build-deps unstable tuto-s4u tuto-smpi tuto-mc
 
 stable:
-	# docker build -f Dockerfile.stable --build-arg DLURL=/simgrid/simgrid/uploads/ddd14d9e34ee36bc90d9107f12480c28/SimGrid-3.24.tar.gz -t simgrid/stable:latest -t simgrid/stable:v3.24 . |tee stable.log
+	# 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/<.*//'); \
-	export DLURL=$$(wget https://framagit.org/simgrid/simgrid/tags/$${last_tag} 2>/dev/null -O - | grep SimGrid- | perl -pe 's/.*?<a href="(\/simgrid[^ ]*tar.gz)".*/$1/'); \
-  echo "DLURL=$$DLURL";\
+ 	echo "DLURL=/simgrid/simgrid/-/archive/$${last_tag}/simgrid-$${last_tag}.tar.gz";\
 	docker build -f Dockerfile.stable \
-	         --build-arg DLURL=$${DLURL} \
+	         --build-arg DLURL=/simgrid/simgrid/-/archive/$${last_tag}/simgrid-$${last_tag}.tar.gz \
 		 -t simgrid/stable:latest \
                  -t simgrid/stable:$${last_tag} \
 		 $(DOCKER_EXTRA) \
@@ -68,9 +67,9 @@ tuto-smpi:
                  . | 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 simgrid/tuto-smpi
-	docker push simgrid/tuto-mc
+	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