README.md

@@ -8,11 +8,11 @@ This container is based on the "lofaruser/imaging-pipeline:v3.10" base image, an
 
 How to run the container with Docker:
 
-    docker run --rm -v $INPUT_DATA_FOLDER:/input_data,$OUTPUT_DATA_FOLDER:/output_data -it lofarit/lofarit/prefactor3_base3.10
+    docker run --rm -v $INPUT_DATA_FOLDER:/input_data,$OUTPUT_DATA_FOLDER:/output_data -it lofarit/prefactor3_base3.10
     
 How to run the container wth Singularity:
 
-    singularity run --pid --writable-tmpfs --containall --cleanenv -B$INPUT_DATA_FOLDER:/input_data,$OUTPUT_DATA_FOLDER:/output_data docker://lofarit lofarit/prefactor3_base3.10
+    singularity run --pid --writable-tmpfs --containall --cleanenv -B$INPUT_DATA_FOLDER:/input_data,$OUTPUT_DATA_FOLDER:/output_data docker://lofarit/prefactor3_base3.10
 
 These commands will start the container and place you in the /home/lofar directlry inside the container. In both cases you have to set the $INPUT_DATA_FOLDER and $OUTPUT_DATA_FOLDER to the input and output data folders respectively, on the host system (i.e. the machine on which you are running the container). Note that the output data folder must exists and have write permissions (if using Singularty, by the user running the container).
 

ddf2/Dockerfile

@@ -10,7 +10,7 @@ ENV PYTHONPATH /opt/lofarsoft/lib/python2.7/site-packages
 #------------------------
 # DDF pipeline
 RUN cd /opt && git clone https://github.com/mhardcastle/ddf-pipeline.git
-RUN cd /opt/ddf-pipeline && git checkout fdaa5aa
+RUN cd /opt/ddf-pipeline && git checkout DR1
 
 # SkyModel
 RUN cd /opt && git clone https://github.com/cyriltasse/SkyModel.git
@@ -32,21 +32,20 @@ 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.6 bdsf==1.8.15 emcee
+RUN python -m pip install numpy==1.16.2 bdsf==1.8.15 emcee
 
-RUN python -m pip install pybind11 future pyregion sshtunnel pymysql psutil
+RUN python -m pip install astropy_healpix 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 numpy==1.16.6
+RUN python -m pip install bdsf==1.8.15 numpy==1.16.2
 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  sed 's/numpy (<=1.16)/numpy (<=1.16.2)/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
 
-ENV CONTAINER_NAME='ddf2_base3.10'
+ENV CONTAINER_NAME='ddf2_public_base3.10'
 ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'

ddf2/build_docker_container.sh

 #!/bin/bash
 set -e 
-rm -rf DDFacet
 
-git clone https://github.com/cyriltasse/DDFacet.git
-git checkout 1059028
-
-docker build  . -t lofarit/ddf2_base3.10 
+docker build  . -t lofarit/ddf2_public_base3.10 

ddf2/run_docker_container.sh

 #!/bin/bash
-docker run --rm -v $PWD/data:/data -it lofarit/ddf2_base3.10 /bin/bash
+docker run --rm -v $PWD/data:/data -it lofarit/ddf2_public_base3.10 /bin/bash

ddf2_public/Dockerfile

+FROM lofarit/base3.10
+
+USER root
+
+RUN apt-get install llvm-7 -y
+ENV LLVM_CONFIG=llvm-config-7 
+ENV PYTHONPATH /opt/lofarsoft/lib/python2.7/site-packages
+#------------------------
+# Get and install ddf2
+#------------------------
+# DDF pipeline
+RUN cd /opt && git clone https://github.com/mhardcastle/ddf-pipeline.git
+RUN cd /opt/ddf-pipeline && git checkout DR1
+
+RUN cd /opt ./ddf-pipeline/scripts/install.sh
+
+RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git
+
+
+ENV CONTAINER_NAME='ddf2_public_base3.10'
+ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'

ddf2_public/build_docker_container.sh

+#!/bin/bash
+set -e 
+
+docker build  . -t lofarit/ddf2_public_base3.10 

ddf2_public/run_docker_container.sh

+#!/bin/bash
+docker run --rm -v $PWD/data:/data -it lofarit/ddf2_public_base3.10 /bin/bash