RUN cd${INSTALLDIR}/casacore/build && make -s-j${NCORES}&& make install&&cd$INSTALLDIR&&rm-rf$INSTALLDIR/casacore/build &&rm-rf$INSTALLDIR/casacore/src
#
# Install Python-CASAcore
#
RUN mkdir${INSTALLDIR}/python-casacore &&cd${INSTALLDIR}/python-casacore && git clone https://github.com/casacore/python-casacore
RUN if["$PYTHON_CASACORE_VERSION"!="latest"];then cd${INSTALLDIR}/python-casacore/python-casacore && git checkout tags/${PYTHON_CASACORE_VERSION};fi
RUN mkdir${INSTALLDIR}/python-casacore &&cd${INSTALLDIR}/python-casacore && git clone https://github.com/casacore/python-casacore&&\
@@ -149,7 +164,7 @@ RUN cd $INSTALLDIR && rm -rf $INSTALLDIR/python-casacore/python-casacore
RUN mkdir-p$INSTALLDIR/dysco/build
RUN cd$INSTALLDIR/dysco && git clone https://github.com/aroffringa/dysco.git src &&cd src
RUN if["$DYSCO_VERSION"!="latest"];then cd$INSTALLDIR/dysco/src && git checkout $DYSCO_VERSION;fi
RUN cd$INSTALLDIR/dysco/build && cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/dysco -DCASACORE_ROOT_DIR=$INSTALLDIR/casacore -DPORTABLE=True ../src && make -s-j$J&& make install
RUN cd$INSTALLDIR/dysco/build && cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/dysco -DCASACORE_ROOT_DIR=$INSTALLDIR/casacore -DPORTABLE=True ../src && make -s-j${NCORES}&& make install
RUN cd$INSTALLDIR&&rm-rf$INSTALLDIR/dysco/build &&rm-rf$INSTALLDIR/dysco/src
#
@@ -158,7 +173,7 @@ RUN cd $INSTALLDIR && rm -rf $INSTALLDIR/dysco/build && rm -rf $INSTALLDIR/dysco
RUN mkdir-p${INSTALLDIR}/aoflagger/build &&cd${INSTALLDIR}/aoflagger && git clone git://git.code.sf.net/p/aoflagger/code aoflagger &&cd${INSTALLDIR}/aoflagger/aoflagger
RUN if["${AOFLAGGER_VERSION}"!="latest"];then cd${INSTALLDIR}/aoflagger/aoflagger && git checkout tags/${AOFLAGGER_VERSION};fi
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd${INSTALLDIR}/aoflagger/build && cmake -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/aoflagger/ -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore -DBUILD_SHARED_LIBS=ON -DPORTABLE=True ../aoflagger
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd${INSTALLDIR}/aoflagger/build && make -s-j${J}&& make install
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd${INSTALLDIR}/aoflagger/build && make -s-j${NCORES}&& make install
RUN cd$INSTALLDIR&&rm-rf$INSTALLDIR/aoflagger/aoflagger &&rm-rf$INSTALLDIR/aoflagger/build &&rm-rf$INSTALLDIR/aoflagger/src
#
@@ -172,11 +187,7 @@ RUN cd $INSTALLDIR/lofar/ && wget https://raw.githubusercontent.com/tikk3r/lofar
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd${INSTALLDIR}/lofar/build/gnucxx11_opt &&CC=/usr/bin/gcc &&CXX=/usr/bin/g++ && cmake -DCMAKE_PREFIX_PATH=$INSTALLDIR/aoflagger:$INSTALLDIR/casacore:$INSTALLDIR/dysco -DBUILD_PACKAGES="Pipeline"-DCMAKE_INSTALL_PREFIX=$INSTALLDIR/lofar/ -DUSE_LOG4CPLUS=OFF -DUSE_OPENMP=True -DBUILD_PYTHON3=OFF ${INSTALLDIR}/lofar/src/ && make -s-j$J&& make install
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd${INSTALLDIR}/lofar/build/gnucxx11_opt && cmake -DCMAKE_PREFIX_PATH=$INSTALLDIR/aoflagger:$INSTALLDIR/casacore:$INSTALLDIR/dysco -DBUILD_PACKAGES="Pipeline"-DCMAKE_INSTALL_PREFIX=$INSTALLDIR/lofar/ -DUSE_LOG4CPLUS=OFF -DUSE_OPENMP=True -DBUILD_PYTHON3=OFF ${INSTALLDIR}/lofar/src/ && make -s-j${NCORES}&& make install
RUN cd$INSTALLDIR&&rm-rf$INSTALLDIR/lofar/build &&rm-rf$INSTALLDIR/lofar/src
#
@@ -192,7 +203,7 @@ RUN cd $INSTALLDIR && rm -rf $INSTALLDIR/msoverview
# Install the standalone StationResponse libraries.
#
RUN mkdir-p$INSTALLDIR/LOFARBeam/build &&cd$INSTALLDIR/LOFARBeam && git clone https://github.com/lofar-astron/LOFARBeam.git src
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd$INSTALLDIR/LOFARBeam/build && cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/lofar ../src && make -j$J&& make install
RUN source$INSTALLDIR/pyenv-py2/bin/activate &&cd$INSTALLDIR/LOFARBeam/build && cmake -DCMAKE_INSTALL_PREFIX=$INSTALLDIR/lofar ../src && make -j${NCORES}&& 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
@@ -203,14 +214,14 @@ RUN mkdir -p $INSTALLDIR/EveryBeam/build && cd $INSTALLDIR/EveryBeam && git clon