diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..c0ff1e74edfba7bb80ac825bb4f6784644a4592b --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ + +ddf2/DDFacet/ +ddf2/killMS/ diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile index e2ad608e42dd850df58c082a980fe00b1ef51953..b5e3989aee74832746a2cc0b287df8cbf3ccf976 100644 --- a/ddf2/Dockerfile +++ b/ddf2/Dockerfile @@ -32,16 +32,18 @@ COPY DDFacet /opt/DDFacet RUN cp /opt/ddf-pipeline/misc/setup.cfg /opt/DDFacet/ # Fix compile options RUN python -m pip install -U pip setuptools wheel RUN pip install -U pip setuptools wheel -RUN python -m pip install numpy==1.16 bdsf==1.8.15 emcee +RUN python -m pip install numpy==1.16.6 bdsf==1.8.15 emcee 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 && rm -rf /opt/DDFacet/Dcbuild && python setup.py build -RUN python -m pip install bdsf==1.8.15 +RUN python -m pip install bdsf==1.8.15 numpy==1.16.6 RUN sed -e "s|INSTALLDIR|/opt|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh +RUN sed 's/numpy (<=1.16)/numpy (<=1.16.6)/g' /usr/local/lib/python2.7/dist-packages/meqtrees_cattery-1.7.0.dist-info/METADATA > /usr/local/lib/python2.7/dist-packages/meqtrees_cattery-1.7.0.dist-info/METADATA + RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git #USER lofar