From b3f0136f52caa79bcba191716085f9c73f1ab125 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Wed, 10 Jul 2019 10:21:34 +0200
Subject: [PATCH] docker: apt allow-releaseinfo-change + cosmetics

---
 tools/docker/Dockerfile.build-deps | 2 +-
 tools/docker/Dockerfile.stable     | 4 +---
 tools/docker/Dockerfile.unstable   | 2 +-
 tools/docker/Makefile              | 9 ++++-----
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/tools/docker/Dockerfile.build-deps b/tools/docker/Dockerfile.build-deps
index b453fd9500..904e240ad0 100644
--- a/tools/docker/Dockerfile.build-deps
+++ b/tools/docker/Dockerfile.build-deps
@@ -2,7 +2,7 @@
 FROM debian:testing
 
 # - Install SimGrid's dependencies
-RUN apt update && \
+RUN apt-get --allow-releaseinfo-change update && \
     apt install -y \
        g++ gcc gfortran default-jdk pybind11-dev \
        git \
diff --git a/tools/docker/Dockerfile.stable b/tools/docker/Dockerfile.stable
index 1b8cd235ed..d8f332bb31 100644
--- a/tools/docker/Dockerfile.stable
+++ b/tools/docker/Dockerfile.stable
@@ -6,7 +6,7 @@ ARG DLURL
 # - Install SimGrid's dependencies
 # - Compile and install SimGrid itself
 RUN echo "DOWNLOAD_URL: ${DLURL}" && \
-    apt update && apt upgrade -y && apt install -y wget && \
+    apt-get --allow-releaseinfo-change update && apt upgrade -y && apt install -y wget && \
     mkdir /source && cd /source && \
     wget https://framagit.org/${DLURL} && \
     tar xf SimGrid-* && rm SimGrid-*tar.gz && \
@@ -19,5 +19,3 @@ RUN echo "DOWNLOAD_URL: ${DLURL}" && \
     apt remove -y  g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev cmake dpkg-dev wget && \
     apt install `sed -e 's/shlibs:Depends=//' -e 's/([^)]*)//g' -e 's/,//g' /tmp/deps` && \
     apt autoremove -y && apt autoclean && apt clean
-
-    
\ No newline at end of file
diff --git a/tools/docker/Dockerfile.unstable b/tools/docker/Dockerfile.unstable
index 6d32dfc369..4d3f75fd57 100644
--- a/tools/docker/Dockerfile.unstable
+++ b/tools/docker/Dockerfile.unstable
@@ -4,7 +4,7 @@ FROM debian:testing
 # - Install SimGrid's dependencies 
 # - Compile and install SimGrid itself. Clean the tree.
 # - Remove everything that was installed, and re-install what's needed by the SimGrid libraries before the Gran Final Cleanup
-RUN apt update && apt -y upgrade && \
+RUN apt-get --allow-releaseinfo-change update && apt -y upgrade && \
     apt install -y g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev cmake dpkg-dev && \
     mkdir /source/ && cd /source && git clone --depth=1 https://framagit.org/simgrid/simgrid.git simgrid.git && \
     cd simgrid.git && \
diff --git a/tools/docker/Makefile b/tools/docker/Makefile
index 5526493ee8..ee4e44cdcf 100644
--- a/tools/docker/Makefile
+++ b/tools/docker/Makefile
@@ -14,12 +14,11 @@ default:
 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/.*?<a href="//' | sed 's/tar.gz.*/tar.gz/'` ;\
-	echo URL:$${url} ; \
+	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/'); \
 	docker build -f Dockerfile.stable \
-	         --build-arg DLURL=$${url} \
-	         -t simgrid/stable:latest \
+	         --build-arg DLURL=$${DLURL} \
+		 -t simgrid/stable:latest \
                  -t simgrid/stable:$${last_tag} \
 		 $(DOCKER_EXTRA) \
                  . | tee > stable.log
-- 
2.20.1