From 3b00124114201bf5ebd1d84d47078104d0b7231d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Mon, 25 Mar 2019 15:01:58 +0000
Subject: [PATCH] SW-612: Fix PyBDSF build/installation for Python3
---
Docker/lofar-pipeline/Dockerfile.tmpl | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Docker/lofar-pipeline/Dockerfile.tmpl b/Docker/lofar-pipeline/Dockerfile.tmpl
index f01a3d59fc0..63306a2a5aa 100644
--- a/Docker/lofar-pipeline/Dockerfile.tmpl
+++ b/Docker/lofar-pipeline/Dockerfile.tmpl
@@ -18,15 +18,17 @@ RUN apt-get update && apt-get install -y python3-scipy liblog4cplus-1.1-9 libxml
# *******************
#
-ENV PYBDSF_VERSION=1.8.12
-
-RUN apt-get update && apt-get install -y git g++ gfortran libboost-python-dev python3-setuptools && \
+ENV PYBDSF_VERSION=v1.9.0
+# Run-time dependencies
+RUN apt-get update && apt-get install -y python3-numpy
+# Build-time dependencies
+RUN apt-get install -y git g++ gfortran libboost-python-dev python3-dev python3-setuptools python3-numpy-dev swig3.0 && \
mkdir ${INSTALLDIR}/pybdsf && \
cd ${INSTALLDIR}/pybdsf && git clone https://github.com/lofar-astron/pybdsf && \
- cd ${INSTALLDIR}/pybdsf/pybdsf && git checkout tags/v${PYBDSF_VERSION} && \
+ cd ${INSTALLDIR}/pybdsf/pybdsf && git checkout ${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 && python3 setup.py install --prefix=${INSTALLDIR}/pybdsf/ && \
- apt-get -y purge git g++ gfortran libboost-python-dev python3-setuptools
+ apt-get -y purge git g++ gfortran libboost-python-dev python3-dev python3-setuptools python3-numpy-dev swig3.0
#
# *******************
--
GitLab