Overrided ddf2 container folder with the develop branch contents in preparation of branch merge.

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 DR1
+RUN cd /opt/ddf-pipeline && git checkout fdaa5aa
 
 # SkyModel
 RUN cd /opt && git clone https://github.com/cyriltasse/SkyModel.git
@@ -46,6 +46,7 @@ RUN  sed 's/numpy (<=1.16)/numpy (<=1.16.2)/g' /usr/local/lib/python2.7/dist-pac
 
 RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git
 
+#USER lofar
 
-ENV CONTAINER_NAME='ddf2_public_base3.10'
+ENV CONTAINER_NAME='ddf2_base3.10'
 ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'

ddf2/build_docker_container.sh

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

ddf2/run_docker_container.sh

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