From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Wed, 16 Oct 2019 15:52:11 +0000 (+0200)
Subject: improve the docker generation scripts
X-Git-Tag: v3.25~530
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/18703ff782a3b8687a1a8c4beb2f78b0db00aff2

improve the docker generation scripts
---

diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index ee4e44cdcf..82f2d907e8 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -14,56 +14,58 @@ default:
 all: build-deps unstable tuto-s4u tuto-smpi
 
 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
 	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="//' | sed 's/tar.gz.*/tar.gz/'); \
+	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";\
 	docker build -f Dockerfile.stable \
 	         --build-arg DLURL=$${DLURL} \
 		 -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
+                 . | tee tuto-mc.log
 
 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
+                 . | tee build-deps-stable.log
 
-tuto-s4u: 
+tuto-s4u:
 	docker build -f Dockerfile.tuto-s4u \
 	         -t simgrid/tuto-s4u:latest \
                  -t simgrid/tuto-s4u:$$(date --iso-8601) \
 		 $(DOCKER_EXTRA) \
-                 . | tee > tuto-s4u.log
+                 . | tee tuto-s4u.log
 
-tuto-smpi: 
+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
+                 . | tee tuto-smpi.log
 
 push:
 	docker push simgrid/build-deps