From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 22 Aug 2018 20:44:00 +0000 (+0200)
Subject: docker: put our sources under /src
X-Git-Tag: v3_21~218
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a622f231d43c8b1275cf3cf7d3e6c3092bd1f86f

docker: put our sources under /src
---

diff --git a/tools/docker/Dockerfile.stable b/tools/docker/Dockerfile.stable
index 9236ec0d21..300ab2d920 100644
--- a/tools/docker/Dockerfile.stable
+++ b/tools/docker/Dockerfile.stable
@@ -7,10 +7,12 @@ ARG DLURL
 # - Compile and install SimGrid itself
 RUN echo "DOWNLOAD_URL: ${DLURL}" && \
     apt update && apt install -y wget && \
-    wget https://framagit.org/${DLURL} && tar xf SimGrid-* && \
+    mkdir /src && cd /src && \
+    wget https://framagit.org/${DLURL} && \
+    tar xf SimGrid-* && rm SimGrid-*tar.gz && \
     cd SimGrid-* && \
     apt install -y gcc g++ default-jdk gfortran libboost-dev libboost-all-dev cmake valgrind libboost-coroutine1.62.0 && \
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=ON -Denable_compile_optimizations=ON . && \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr/ -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=ON -Denable_compile_optimizations=ON . && \
     make -j4 install && make clean && \
     apt remove -y  gcc g++ default-jdk gfortran libboost-dev libboost-all-dev cmake wget && \
     apt autoremove -y && apt autoclean && apt clean
diff --git a/tools/docker/Dockerfile.tuto-s4u b/tools/docker/Dockerfile.tuto-s4u
index 8bc81e2291..e25f1e68d9 100644
--- a/tools/docker/Dockerfile.tuto-s4u
+++ b/tools/docker/Dockerfile.tuto-s4u
@@ -3,6 +3,7 @@ FROM simgrid/unstable
 
 # - Clone simgrid-template-s4u, as it is needed by the tutorial
 RUN apt install -y pajeng r-base r-cran-ggplot2 r-cran-dplyr cmake g++ && \
+    cd /src && \
     git clone --depth=1 https://framagit.org/simgrid/simgrid-template-s4u.git
 
     
\ No newline at end of file
diff --git a/tools/docker/Dockerfile.unstable b/tools/docker/Dockerfile.unstable
index b6f09fdea6..0fdeea8bfa 100644
--- a/tools/docker/Dockerfile.unstable
+++ b/tools/docker/Dockerfile.unstable
@@ -5,9 +5,9 @@ FROM debian:testing
 # - Compile and install SimGrid itself
 RUN apt update && \
     apt install -y g++ gcc git valgrind default-jdk gfortran libboost-dev libboost-all-dev libboost-coroutine1.62.0 cmake && \
-    git clone --depth=1 https://framagit.org/simgrid/simgrid.git && \
-    cd simgrid && \
-    cmake -DCMAKE_INSTALL_PREFIX=/usr -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=ON -Denable_compile_optimizations=ON . && \
+    mkdir /src/ && cd /src && git clone --depth=1 https://framagit.org/simgrid/simgrid.git simgrid.git && \
+    cd simgrid.git && \
+    cmake -DCMAKE_INSTALL_PREFIX=/usr/ -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=ON -Denable_compile_optimizations=ON . && \
     make -j4 install && make clean && \
     apt remove -y default-jdk gfortran libboost-dev libboost-all-dev cmake && \
     apt autoremove -y && apt autoclean && apt clean