diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile index c19a142c1dd5bfbbe558258612259a88a3d82c9d..068d9d98a99184d009fcd173265ea63e90315101 100644 --- a/ddf2/Dockerfile +++ b/ddf2/Dockerfile @@ -27,7 +27,13 @@ RUN cd /opt/DynSpecMS && git checkout 461183f # DDFacet COPY DDFacet /opt/DDFacet RUN cp /opt/ddf-pipeline/misc/setup.cfg /opt/DDFacet/ # Fix compile options + +RUN pip install -U pip setuptools wheel +RUN python -m pip install pybind11 future pyregion sshtunnel pymysql psutil +#RUN python -m pip install -U "/opt/DDFacet/[dft-support,moresane-support,testing-requirements,fits-beam-support]" + RUN cd /opt/DDFacet && python setup.py build + RUN sed -e "s|INSTALLDIR|/opt|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh diff --git a/ddf2/build_docker_container.sh b/ddf2/build_docker_container.sh index 1a3f7beb472701f7bbd4bd73edb5b7742fac0c45..7c8ffc5cfbd447e635c8846a42858f9ce09f95ef 100755 --- a/ddf2/build_docker_container.sh +++ b/ddf2/build_docker_container.sh @@ -1,6 +1,8 @@ #!/bin/bash set -e rm -rf DDFacet + git clone https://github.com/cyriltasse/DDFacet.git -# git checkout {version hash} -docker build . -t lofarit/ddf2_base3.10 +git checkout 1059028 + +docker build . -t lofarit/ddf2_base3.10