Commit 2e02aeb1 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Fixed in the D3P build.

parent d01dc156

base/astro/Dockerfile

+14 −4
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ RUN cd $INSTALLDIR && rm -rf $INSTALLDIR/aoflagger/aoflagger && rm -rf $INSTALLD 
# Install LOFAR

#=============================

RUN mkdir -p ${INSTALLDIR}/lofar/build/gnucxx11_opt 

RUN cd ${INSTALLDIR}/lofar && svn checkout https://svn.astron.nl/LOFAR/trunk src

#RUN cd ${INSTALLDIR}/lofar && svn checkout https://svn.astron.nl/LOFAR/trunk src

RUN cd ${INSTALLDIR}/lofar && svn checkout https://svn.astron.nl/LOFAR/tags/LOFAR-Release-${LOFAR_VERSION} src

RUN cd $INSTALLDIR/lofar && svn update --depth=infinity $INSTALLDIR/lofar/src/CMake

RUN cd $INSTALLDIR/lofar/ && wget https://raw.githubusercontent.com/tikk3r/lofar-grid-hpccloud/cd33001869d8318ca1ee14e838ac40122c405260/patches/lofar.patch && \
@@ -219,7 +219,7 @@ RUN cd $INSTALLDIR && rm -rf $INSTALLDIR/msoverview 
#=============================



RUN mkdir -p $INSTALLDIR/LOFARBeam/build && cd $INSTALLDIR/LOFARBeam && git clone https://github.com/lofar-astron/LOFARBeam.git src

RUN cd $INSTALLDIR/LOFARBeam && git checkout 5b5d80ff308784adbf00985293257b16afff86b2

RUN cd $INSTALLDIR/LOFARBeam/src && git checkout 5b5d80ff308784adbf00985293257b16afff86b2

RUN source $INSTALLDIR/pyenv-py2/bin/activate && cd $INSTALLDIR/LOFARBeam/build && cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/lofar ../src && make -j $J && make install

RUN touch /opt/lofar/lofar/lib64/python2.7/site-packages/lofar/__init__.py

RUN cd $INSTALLDIR && rm -rf $INSTALLDIR/LOFARBeam/build && rm -rf $INSTALLDIR/LOFARBeam/src
@@ -233,6 +233,17 @@ RUN mkdir -p $INSTALLDIR/EveryBeam/build && cd $INSTALLDIR/EveryBeam && git clon 
    cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/EveryBeam ../src && \

    make -j $J && make install



#=============================

# Install idg

#=============================

RUN mkdir -p $INSTALLDIR/idg/build && cd $INSTALLDIR/idg && git clone https://gitlab.com/astron-idg/idg src  && \

    cd src && git checkout 44c4fc08 && \

    #cmake -DCMAKE_INSTALL_PREFIX=/usr/local/idg/ .. && \

    cd $INSTALLDIR/idg/build && \

    cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/idg ../src && \

    make -j $J && make install





#=============================

# Install DPPP

#=============================
@@ -353,4 +364,3 @@ RUN sed -e 's/\\\$/\$/g' /opt/lofar/init.sh 
#=============================



USER metauser
 
 No newline at end of file