From 5ea7b4ca1ca3661684c2f7798473069f10770a20 Mon Sep 17 00:00:00 2001
From: Giuliano Taffoni <giuliano.taffoni@inaf.it>
Date: Thu, 14 Oct 2021 23:36:01 +0200
Subject: [PATCH] solve dysco problem and initialization

---
 base/Dockerfile     |  2 +-
 ddf2/Dockerfile     |  7 ++++---
 software/Dockerfile | 20 ++++++++++++++++----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index da128b2..b00556c 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -1,4 +1,4 @@
-FROM morgan1971/lofar_metadesktop:1.0
+FROM morgan1971/lofar_metadesktop:0.1.0
 MAINTAINER Giuliano Taffoni <giuliano.taffoni@inaf.it>
 USER root
 ENV CONTAINER_NAME='LofarBase'
diff --git a/ddf2/Dockerfile b/ddf2/Dockerfile
index e9d2e87..926f47b 100644
--- a/ddf2/Dockerfile
+++ b/ddf2/Dockerfile
@@ -25,6 +25,7 @@ RUN  chmod 600 /home/lofar/.ssh/lofarit_ddf2_rsa && \
      chmod 600 /home/lofar/.ssh/lofarit_killms_rsa && \
      chown -R lofar.lofar /home/lofar/
 RUN apt -y install python3-psycopg2
+RUN python3 -m pip install -U pip
 RUN python3 -m pip install -U pip setuptools wheel
 
 USER lofar
@@ -94,10 +95,10 @@ RUN sudo apt-get -y clean
 # PATHS and enviroments
 #
 RUN sed -e "s|INSTALLDIR|/pyenv-py3|" /pyenv-py3/ddf-pipeline/misc/DDF.sh > /pyenv-py3/DDF.sh
-RUN echo "sh /pyenv-py3/DDF.sh" >> /home/lofar/.bashrc
+RUN echo "source /pyenv-py3/DDF.sh" >> /home/lofar/.bashrc
 ENV PATH /usr/local/bin:/home/lofar/.local/bin:$PATH
-ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
-ENV DDF_PIPELINE_CATALOGS='/opt/container-data/bootstrap-cats/'
+ENV LD_LIBRARY_PATH /usr/local/lib:/opt/dysco/lib/:$LD_LIBRARY_PATH
+ENV DDF_PIPELINE_CATALOGS='/pyenv-py3/container-data/bootstrap-cats/'
 ENV MEQTREES_CATTERY_PATH /usr/local/lib/python3.6/dist-packages/Cattery/
 RUN echo "echo PYTHONPATH $MEQTREES_CATTERY_PATH:$PYTHONPATH" >> /home/lofar/.bashrc
 RUN echo "echo PYTHONPATH /usr/local/lib/python3.6/site-packages:$PYTHONPATH" >> /home/lofar/.bashrc
diff --git a/software/Dockerfile b/software/Dockerfile
index 3915c3b..a4e10a7 100644
--- a/software/Dockerfile
+++ b/software/Dockerfile
@@ -42,8 +42,10 @@ LABEL it.inaf.lofar.software.lofarbeam=4.1.1
 #####################################################################################
 RUN sudo apt-get -y install  python3-astro-kittens python3-purr python3-astro-tigger-lsm python3-astro-tigger \
          libwsclean2 wsclean wsclean-dev aoflagger aoflagger-dev libaoflagger0 \
-         libblitz0 libblitz0-dev  dysco dysco-dev libdyscostman2 libxml2-dev \
+         libblitz0 libblitz0-dev  libxml2-dev \
          python3-rmextract python3-lsmtool python3-psycopg2
+#dysco dysco-dev libdyscostman2 
+
 LABEL it.inaf.lofar.software.wsclean=2.9-2 \
       it.inaf.lofar.software.tigger-lsm=1.6.0 \
       it.inaf.lofar.software.kittens=1.4.3-1 \
@@ -80,7 +82,7 @@ RUN mkdir -p /src/build && cd /src/ && \
     cmake ../DP3-4.2 -DPYTHON_EXECUTABLE=/usr/bin/python3 \
     -DBoost_PYTHON36_LIBRARY=/usr/lib/x86_64-linux-gnu/libboost_python-py36.so \
     -DBoost_NUMPY36_LIBRARY=/usr/lib/x86_64-linux-gnu/libboost_numpy3-py36.so  && \
-     make -j 4 && make install && rm -fr /src
+     make -j 40 && make install && rm -fr /src
 LABEL it.inaf.lofar.software.dppp=4.2
 
 #####################################################################
@@ -103,7 +105,7 @@ RUN mkdir -p /src/EveryBeam/build && cd /src/EveryBeam && \
     git clone https://git.astron.nl/RD/EveryBeam.git src && \
     cd src && git checkout $EVERYBEAM_VERSION && \
     cd /src/EveryBeam/build && \
-    cmake ../src && make -j 4 && make install
+    cmake ../src && make -j 40 && make install
 LABEL it.inaf.lofar.software.everybeam=0.2.0
 
 #####################################################################
@@ -123,7 +125,7 @@ RUN apt-get install -y libqdbm-dev
 RUN cd /tmp/ && wget https://github.com/ska-sa/meqtrees-timba/archive/v${TIMBA_VERSION}.tar.gz && \
     tar -xvf v${TIMBA_VERSION}.tar.gz && mkdir /tmp/meqtrees-timba-${TIMBA_VERSION}/build && \
     cd /tmp/meqtrees-timba-${TIMBA_VERSION}/build  && cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_PYTHON_3=ON .. && \
-    make -j4 && make install && ldconfig && rm -fr /tmp/meqtrees-timba-${TIMBA_VERSION}/ /tmp/v${TIMBA_VERSION}.tar.gz
+    make -j40 && make install && ldconfig && rm -fr /tmp/meqtrees-timba-${TIMBA_VERSION}/ /tmp/v${TIMBA_VERSION}.tar.gz
 
 #####################################################################
 # Install pyxis 1.7.0
@@ -135,6 +137,16 @@ RUN cd /tmp && wget https://github.com/ska-sa/pyxis/archive/v${PYXIS_VERSION}.ta
 RUN cp -r /tmp/pyxis-${PYXIS_VERSION}/Pyxis/recipies /usr/local/lib/python3.6/dist-packages/Pyxis/
 RUN rm -fr /tmp/v${PYXIS_VERSION}.tar.gz /tmp/pyxis-${PYXIS_VERSION}
 
+#####################################################################
+## Install DYSCO 1.2
+######################################################################
+ENV DYSCO_VERSION=v1.2
+RUN mkdir  -p /tmp/dysco/build && cd /tmp/dysco/ && git clone https://github.com/aroffringa/dysco.git src && \
+    cd /tmp/dysco/src &&  git checkout ${DYSCO_VERSION} && cd /tmp/dysco/build &&  \
+    cmake -DCMAKE_INSTALL_PREFIX=/opt/dysco  -DPORTABLE=True ../src && make -j 40 && make install && \
+    rm -fr /tmp/dysco
+
+
 ENV PATH /usr/local/bin:$PATH
 ENV LD_LIBRARY_PATH /usr/local/lib:$LD_LIBRARY_PATH
 RUN apt-get -y clean
-- 
GitLab