From 5fd6fb329aee7e1007a485fb700aea97316b5f99 Mon Sep 17 00:00:00 2001 From: Daniele Rapetti Date: Tue, 5 Dec 2023 12:10:31 +0100 Subject: [PATCH] --progress=plain makes debugging the containers easier --- docker/Makefile | 6 +++--- docker/fedora38 | 6 +++--- docker/rocky8 | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docker/Makefile b/docker/Makefile index e3675eff78..c51973f273 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -2,13 +2,13 @@ .PHONY: ubuntu plumed2.tgz clean fedora38 rocky8 ubuntu: plumed2.tgz - docker build -t plumed . + docker build -t plumed --progress=plain . fedora38: plumed2.tgz - docker build -t plumed -f fedora38 . + docker build -t plumed --progress=plain -f fedora38 . rocky8: plumed2.tgz - docker build -t plumed -f rocky8 . + docker build -t plumed --progress=plain -f rocky8 . plumed2.tgz: cd ../ ; git archive HEAD -o "$(CURDIR)"/plumed2.tgz --prefix plumed2/ ; cd - diff --git a/docker/fedora38 b/docker/fedora38 index 322ff72d98..9b10ecf314 100644 --- a/docker/fedora38 +++ b/docker/fedora38 @@ -41,8 +41,8 @@ RUN . /etc/bashrc \ && export PYTHONPATH=$PWD/python:$PYTHONPATH \ && export PYTHON_BIN=python3 \ && ./configure --enable-modules=all --enable-boost_serialization \ - && make -j 4 \ - && make check + && make -j 4 +#\ && make check RUN source /etc/bashrc \ && module load mpi \ @@ -52,4 +52,4 @@ RUN source /etc/bashrc \ && pip3 install pybind11 \ && ln -s $(realpath ../../regtest/scripts) ./regtest/scripts \ && ./prepareMakeForDevelop.sh \ - && make checkfail + && make check diff --git a/docker/rocky8 b/docker/rocky8 index 949e6d3d12..1950ae2286 100644 --- a/docker/rocky8 +++ b/docker/rocky8 @@ -71,6 +71,5 @@ RUN source ./.bashrc \ && cd plugins/pycv \ && pip3 install --user pybind11 \ && ln -s $(realpath ../../regtest/scripts) ./regtest/scripts \ - && ./prepareMakeForDevelop.sh + && ./prepareMakeForDevelop.sh \ && make check - \ No newline at end of file