SW-612: Specify Python3 in build and run-time packages

Docker/lofar-pipeline/Dockerfile.tmpl

@@ -6,10 +6,10 @@ FROM lofar-base:${LOFAR_TAG}
 ENV AOFLAGGER_VERSION=2.8.0
 
 # Run-time dependencies
-RUN apt-get update && apt-get install -y python-xmlrunner python-scipy liblog4cplus-1.1-9 libxml2 libboost-thread${BOOST_VERSION}.0 libboost-filesystem${BOOST_VERSION}.0 libboost-date-time${BOOST_VERSION}.0 libboost-signals${BOOST_VERSION}.0 libpng12-0 libsigc++-2.0-dev libxml++2.6-2v5 libgsl2 openssh-client libboost-regex${BOOST_VERSION}.0 gettext-base rsync python-matplotlib ipython slurm-client libhdf5-cpp-11 && \
-    apt-get -y install python-pip python-dev && \
-    pip install pyfits pywcs python-monetdb && \
-    apt-get -y purge python-pip python-dev && \
+RUN apt-get update && apt-get install -y python3-scipy liblog4cplus-1.1-9 libxml2 libboost-thread${BOOST_VERSION}.0 libboost-filesystem${BOOST_VERSION}.0 libboost-date-time${BOOST_VERSION}.0 libboost-signals${BOOST_VERSION}.0 libpng12-0 libsigc++-2.0-dev libxml++2.6-2v5 libgsl2 openssh-client libboost-regex${BOOST_VERSION}.0 gettext-base rsync python3-matplotlib ipython slurm-client libhdf5-cpp-11 && \
+    apt-get -y install python3-dev && \
+    pip3 install python-xmlrunner pyfits pywcs python-monetdb && \
+    apt-get -y purge python3-dev && \
     apt-get -y autoremove --purge
 
 #
@@ -20,13 +20,13 @@ RUN apt-get update && apt-get install -y python-xmlrunner python-scipy liblog4cp
 
 ENV PYBDSF_VERSION=1.8.12
 
-RUN apt-get update && apt-get install -y git g++ gfortran libboost-python-dev python-setuptools && \
+RUN apt-get update && apt-get install -y git g++ gfortran libboost-python-dev python3-setuptools && \
     mkdir ${INSTALLDIR}/pybdsf && \
     cd ${INSTALLDIR}/pybdsf && git clone https://github.com/lofar-astron/pybdsf && \
     cd ${INSTALLDIR}/pybdsf/pybdsf && git checkout tags/v${PYBDSF_VERSION} && \
     mkdir -p ${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ && \
     export PYTHONPATH=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages:${INSTALLDIR}/pybdsf/lib64/python${PYTHON_VERSION}/site-packages:$PYTHONPATH && cd ${INSTALLDIR}/pybdsf/pybdsf && python setup.py install --prefix=${INSTALLDIR}/pybdsf/ && \
-    apt-get -y purge git g++ gfortran libboost-python-dev python-setuptools
+    apt-get -y purge git g++ gfortran libboost-python-dev python3-setuptools
 
 #
 # *******************