Skip to content

Commit

Permalink
--progress=plain makes debugging the containers easier
Browse files Browse the repository at this point in the history
  • Loading branch information
Iximiel committed Dec 5, 2023
1 parent 2bcf308 commit 5fd6fb3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions docker/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
6 changes: 3 additions & 3 deletions docker/fedora38
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -52,4 +52,4 @@ RUN source /etc/bashrc \
&& pip3 install pybind11 \
&& ln -s $(realpath ../../regtest/scripts) ./regtest/scripts \
&& ./prepareMakeForDevelop.sh \
&& make checkfail
&& make check
3 changes: 1 addition & 2 deletions docker/rocky8
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5fd6fb3

Please sign in to comment.