factorize the starpu download

.gitlab-ci.yml

@@ -35,7 +35,7 @@ build-distrib:
       - dockerfile-ci
       - dockerfile-distrib
   script:
-    - docker build -f dockerfile-distrib -t $CI_REGISTRY_IMAGE/distrib .
+    - docker build -f dockerfile-distrib -t $CI_REGISTRY_IMAGE/distrib . 
         | tee build.log
     - docker push $CI_REGISTRY_IMAGE/distrib
   extends: .config

dockerfile-distrib

@@ -106,8 +106,8 @@ ENV PKG_CONFIG_PATH=$PARSEC_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 
 # Install SimGrid
 RUN cd $HOME && \
-    wget https://framagit.org/simgrid/simgrid/uploads/c45f7fd6872b3b0d26b9ba2e607d6e3a/simgrid-3.32.tar.gz && \
-    tar xvzf simgrid-3.32.tar.gz && \
+    wget https://framagit.org/simgrid/simgrid/uploads/c45f7fd6872b3b0d26b9ba2e607d6e3a/simgrid-3.32.tar.gz > /dev/null 2>&1 && \
+    tar xzf simgrid-3.32.tar.gz && \
     cd simgrid-3.32 && \
     cmake . -DCMAKE_INSTALL_PREFIX=/home/gitlab/install/simgrid -DCMAKE_BUILD_TYPE=Debug -Denable_msg=ON && \
     make -j5 && \
@@ -117,41 +117,42 @@ RUN cd $HOME && \
 ENV SIMGRID_DIR=/home/gitlab/install/simgrid
 ENV PKG_CONFIG_PATH=$SIMGRID_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 
-# Install StarPU 1.4
 RUN cd $HOME && \
-    wget https://files.inria.fr/starpu/starpu-1.4.1/starpu-1.4.1.tar.gz && \
-    tar xvzf starpu-1.4.1.tar.gz && \
+    wget https://files.inria.fr/starpu/starpu-1.4.1/starpu-1.4.1.tar.gz > /dev/null 2>&1
+
+# Install StarPU 1.4
+RUN CD $HOME && \
+    tar xzf starpu-1.4.1.tar.gz && \
     cd starpu-1.4.1/ && \
     ./configure --prefix=/home/gitlab/install/starpu --enable-debug && \
     make -j5 && \
     make install && \
     cd $HOME && \
-    rm starpu-1.4.1/ starpu-1.4.1.tar.gz -rf
+    rm -rf starpu-1.4.1/
 ENV STARPU_DIR=/home/gitlab/install/starpu
 ENV PKG_CONFIG_PATH=$STARPU_DIR/lib/pkgconfig:$PKG_CONFIG_PATH
 
 # Install StarPU 1.4 with Simgrid
 RUN cd $HOME && \
-    wget https://files.inria.fr/starpu/starpu-1.4.1/starpu-1.4.1.tar.gz && \
-    tar xvzf starpu-1.4.1.tar.gz && \
+    tar xzf starpu-1.4.1.tar.gz && \
     cd starpu-1.4.1/ && \
     export LD_LIBRARY_PATH=/home/gitlab/install/simgrid/lib:$PKG_CONFIG_PATH && \
     ./configure --prefix=/home/gitlab/install/starpu-simgrid --enable-debug --disable-cuda --disable-opencl --with-fxt --enable-simgrid && \
     make -j5 && \
     make install && \
     cd $HOME && \
-    rm starpu-1.4.1/ starpu-1.4.1.tar.gz -rf
+    rm -rf starpu-1.4.1/
 
 # Install StarPU 1.4 with HIP
 ENV LD_LIBRARY_PATH=/opt/rocm/lib
 ENV HIPCCFLAGS="-fPIC"
 RUN cd $HOME && \
-    wget https://files.inria.fr/starpu/starpu-1.4.1/starpu-1.4.1.tar.gz && \
-    tar xvzf starpu-1.4.1.tar.gz && \
+    tar xzf starpu-1.4.1.tar.gz && \
     cd starpu-1.4.1/ && \
     ./configure --prefix=/home/gitlab/install/starpu-hip --enable-debug --disable-cuda --enable-hip && \
     make -j5 install && \
-    cd $HOME && rm starpu-1.4.1/ -rf && rm starpu-1.4.1.tar.gz
+    cd $HOME && \
+    rm -rf starpu-1.4.1/
 
 # Install Starpu 1.4 with HIP+CUDA
 ENV HIPCUDA_DIR=/home/gitlab/hipcuda
@@ -174,16 +175,19 @@ RUN cd $HOME && \
     cmake .. -DCMAKE_INSTALL_PREFIX=$HIPCUDA_DIR -DHIP_ROOT_DIR=$HIPCUDA_DIR -DUSE_CUDA=ON && \
     make -j5 install
 RUN cd $HOME && \
-    wget https://files.inria.fr/starpu/starpu-1.4.1/starpu-1.4.1.tar.gz && \
-    tar xvzf starpu-1.4.1.tar.gz && \
+    tar xzf starpu-1.4.1.tar.gz && \
     cd starpu-1.4.1/ && \
     ./configure --prefix=/home/gitlab/install/starpu-hipcuda --enable-debug --disable-cuda --enable-hip --with-hipblas=$HIPCUDA_DIR && \
     make -j5 install && \
-    cd $HOME && rm starpu-1.4.1/ -rf && rm starpu-1.4.1.tar.gz
+    cd $HOME && \
+    rm -rf starpu-1.4.1/
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 ENV LD_LIBRARY_PATH=""
 ENV HIP_PLATFORM=""
 
+RUN cd $HOME && \
+    rm -rf starpu-1.4.1.tar.gz
+
 # Install Chameleon
 RUN cd $HOME && \
     git clone --recursive https://gitlab.inria.fr/solverstack/chameleon.git && \