From 5e8fa56223bedc4934ac969e42775a8c758b8bc5 Mon Sep 17 00:00:00 2001
From: Fabio Roberto Vitello <fabio.vitello@inaf.it>
Date: Wed, 29 Apr 2020 12:35:00 +0200
Subject: [PATCH] Updated DDF2 Dependencies

- Added Lofar Beam to base image
- changed killMS version to the private one
- Added bootstrap cats from https://www.ict.inaf.it/gitlab/lofarit/container-data.git
- ddf container now run as root
---
 .DS_Store          | Bin 0 -> 10244 bytes
 base/Dockerfile    |   3 ++-
 base/entrypoint.sh |   2 +-
 ddf2/Dockerfile    |  24 ++++++++++++++++--------
 4 files changed, 19 insertions(+), 10 deletions(-)
 create mode 100644 .DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..fe5ea3ce7a1e7fc318c5d8176e3830d61b978af7
GIT binary patch
literal 10244
zcmZQzU|@7AO)+F(P+(wS;9!8z0z3>@0Z1N%F(jFwA|Odd1_l9!r1Ii|q@4UD1_p+c
zP`OcRGz3ONU^E0qLtr!nMnhn5g#aVOIUL*&dXyXufzc2c4FPxvfXW9@2LVJofcgv!
z3=9nr8YINP$iM*Z0x&W#u)s8d`vDL&Agv%ZAgv%8q?LgY!~)BMwK6b5wK9UcAq)(R
z3<6-I7{Of=5Ff0afe~yo0|O)2W(EdEh;{}>sLhO^P6)_ch;{}>u<Z;Cj1cW$Ge?Qh
z5Eu;s)DQq=8y1EnhD3&9hE(MKds0D8W^svu!F5I^W)@a9b`DMsP7Yp<*x-!(^5Bxh
zlG0+Q#G+^rFCeibBMHh5$<NP$vlElTGE>Xr1w@?l^GXsk^HPgI%7ZggQj-#kV!|`?
zQu524@=NnlioxbUB|!FY#tTSPSDPE@C>WVq*6Ju!8yZ*`>L{2Po7L8Ga)_%M+IlAB
zR#sKl)Yi>}_y<-lFz`e8aB>y{sC0sQFsHc888Se@G#%!_8*mSDaZ7r7ars1KCg<k`
zXI7=g3-A|b<d=IU=jR0!rIux;mWL<j=alB=6~_w*CMV`3m*ymvq&nv0fD{);l%!Ua
zfLKw*`9&qpV1@Al0;R>NL8&>3C7ETZE{P?n#qk0{Ad~zHN;32Fio;TiiZk=`lpPEp
z4(43VBPy$;rfpzqW$$u@mych7i%VD}yezXgGbtxEGO;*0H7_MIFFmw8Go>UWDl;WD
zuOu@qGqs45Q;>->Brh>H^@^Cdgn*=!qzp_KL@h!uhk!CiL}^lHVQFSbCBzO%1w~E{
zfvqtqi6yDN`6(b1Q@}Ekk_xIE9MK?g=c3fal2nK=m!zf^Cx<{{NO5LWDp(;Gm!3W+
zr$BK?c4i(#jU<<`2?wV@N@z}EQfdxZktCOeB?qT~cX%1Z+fYGUI}T1kMxBV{{M_8s
zypm#wu%weS2Zz9kIFQ{wiNz)U1*v(dDG=W&NV;=yM1o`-Q&Lh>IFubUAmIlN0Zsu>
zZ6e8_#9+c;!w|p_$&kWO&d|d!m0=pgB8Jrrn;G^p9A-GjaGv1;!)1mW3=bJzGQ4N_
z$?%Ke55r$ZHb#C%0Y*VaVMYZ;O-3z7ZANoO2S!ImCq@@WPsSj|V8#%}Fve)c6vkA>
zG{y|ZJjQay3dTytYQ|>99>!kAKE{cRvltgME@52CxSVkt<9@~ij0YJ{GoE3*%6N<M
zHpHDw&}xjq7s7{;jCawJD|9@KDGpn5m34FHavIR&dXoo~Mg@h0MMUM4HFS;4Z5-jz
zh!%6mi3pr-APEDUU|<OX9DS&%P)uAxQi@APHZ(IYCA9*PiXo{Qmc|9xK`Dp>lsY8k
zWff%wKuHI}RgqPb6=32J*b3ol%4%~7Fmnhba)K4>aT&-8uyP8dKxB=%Ot}PDI0cF!
zvKCxcvI1<J0^Sf=TP}Mp0R~V`gGf8cs&NT0a&V%jKL!p4?5S@h!zPA<3}+cGG2CFd
z%kY%p6~lK%21YhU0Y))KIYtFWMMf1yRYpBV14cteV@4B3TSj|E2Sz7GXGR}JKSqDX
zK*k`(XvSE^IK~9VM8+(}9L8M6e8vKB>Z@U_W2|TFVC-V-X6$3^XPm(}i*YvN9LBkf
z%NSQf(ic3{c|!Owl5q`ksw)dF%FD^mO9!>4z~U(kDGX^0M#HyufO>GWcF4?2AFUk*
zeeHlquA{ZXXzf6++5wvC&}s)*6*5YXhQMeD46P7ghB#LNH2&|(z<_K1AEIiM91Vfd
z5Ezyrz{uhf?BWFN?qTyGXsjJHo}K`e1Pxw*M)Mg#<MR-GASIxoeeiHR6J${lcua<o
lfdM+U1y&3mj%S3-BMjVRz-a#;8j}!ewEqtt;22T;e*lN_`7Hnd

literal 0
HcmV?d00001

diff --git a/base/Dockerfile b/base/Dockerfile
index d12eed7..1d872e3 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -14,7 +14,8 @@ RUN apt update
 # Git, Curl, sudo and  Nano
 RUN apt-get install git curl sudo nano -y
 
-
+RUN cd /opt/ && git clone https://github.com/lofar-astron/LOFARBeam.git
+RUN mkdir /opt/LOFARBeam/build && cd /opt/LOFARBeam/build && cmake -DCMAKE_INSTALL_PREFIX=/opt/lofarsoft -DPYTHON_EXECUTABLE=$(which python) -DCASACORE_INCLUDE_DIRS=/opt/lofarsoft/include/casacore/ -DCASACORE_LIBRARIES=/opt/lofarsoft/lib/ -DCASACORE_ROOT_DIR=/opt/lofarsoft/ ../ && make -j16 && make install 
 #------------------------
 # Lofar user
 #------------------------
diff --git a/base/entrypoint.sh b/base/entrypoint.sh
index 2533c56..57e43a5 100644
--- a/base/entrypoint.sh
+++ b/base/entrypoint.sh
@@ -7,7 +7,7 @@ set -e
 echo ""
 echo "[INFO] Executing entrypoint..."
 
-echo "[INFO] Sourcing env in /opt/lofarsoft/lofarinit.sh..."
+#echo "[INFO] Sourcing env in /opt/lofarsoft/lofarinit.sh..."
 source /opt/lofarsoft/lofarinit.sh
 
 echo "[INFO] Creating /tmp/lofarhome to be used as lofar home"
diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile
index 068d9d9..9dede8f 100644
--- a/ddf2/Dockerfile
+++ b/ddf2/Dockerfile
@@ -1,10 +1,13 @@
 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
 #------------------------
-USER root
-
 # DDF pipeline
 RUN cd /opt && git clone https://github.com/mhardcastle/ddf-pipeline.git
 RUN cd /opt/ddf-pipeline && git checkout fdaa5aa
@@ -14,8 +17,8 @@ RUN cd /opt && git clone https://github.com/cyriltasse/SkyModel.git
 RUN cd /opt/SkyModel && git checkout 026997f
 
 # killMS
-RUN cd /opt && git clone https://github.com/saopicc/killMS.git
-RUN cd /opt/killMS && git checkout b9e6ab6 #lofar-stable branch latest commit @ 24 Apr 2020
+COPY killMS /opt/killMS
+#RUN cd /opt/killMS && python setup.py build
 RUN cd /opt/killMS/Predict && make
 RUN cd /opt/killMS/Array/Dot && make
 RUN cd /opt/killMS/Gridder && make
@@ -27,16 +30,21 @@ 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 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
+
 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 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 cd /opt/DDFacet && rm -rf /opt/DDFacet/Dcbuild && python setup.py build
 
+RUN python -m pip install bdsf==1.8.15
 RUN sed -e "s|INSTALLDIR|/opt|" /opt/ddf-pipeline/misc/DDF.sh > /opt/DDFacet/init.sh
 
+RUN cd /opt && git clone https://www.ict.inaf.it/gitlab/lofarit/container-data.git
 
-USER lofar
+#USER lofar
 
 ENV CONTAINER_NAME='ddf2_base3.10'
+ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'
-- 
GitLab