From 465d977452e86e6a3b797da8190e7f3c75115229 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 23 Aug 2018 10:13:58 +0200 Subject: [PATCH] docker: Try to reduce the image sizes --- tools/docker/Dockerfile.stable | 2 +- tools/docker/Dockerfile.unstable | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/docker/Dockerfile.stable b/tools/docker/Dockerfile.stable index 300ab2d920..655dab8993 100644 --- a/tools/docker/Dockerfile.stable +++ b/tools/docker/Dockerfile.stable @@ -14,7 +14,7 @@ RUN echo "DOWNLOAD_URL: ${DLURL}" && \ 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 . && \ make -j4 install && make clean && \ - apt remove -y gcc g++ default-jdk gfortran libboost-dev libboost-all-dev cmake wget && \ + apt remove -y gcc g++ default-jdk gfortran libboost-dev libboost-all-dev cmake wget gdb valgrind && \ 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 0fdeea8bfa..692182e29c 100644 --- a/tools/docker/Dockerfile.unstable +++ b/tools/docker/Dockerfile.unstable @@ -8,8 +8,7 @@ RUN apt update && \ 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 && \ + make -j4 install && \ + git reset --hard master && git clean -dfx && \ + apt remove -y default-jdk gfortran libboost-dev libboost-all-dev cmake gdb valgrind && \ apt autoremove -y && apt autoclean && apt clean - - \ No newline at end of file -- 2.20.1