From b4d5141c3630d6f37843bf4f3dc6d89506affab3 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:54 +0000
Subject: [PATCH] SW-612: Install python-qpid-proton with pip3
---
Docker/lofar-base/Dockerfile.tmpl | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/Docker/lofar-base/Dockerfile.tmpl b/Docker/lofar-base/Dockerfile.tmpl
index e00122b2204..d5156453e16 100644
--- a/Docker/lofar-base/Dockerfile.tmpl
+++ b/Docker/lofar-base/Dockerfile.tmpl
@@ -111,25 +111,16 @@ RUN apt-get update && apt-get install -y git make g++ python3-setuptools libboos
#
# *******************
-# QPID client
+# Apache Proton
# *******************
#
-# Run-time dependencies
-# QPID daemon legacy store would require: libaio1 libdb5.1++
-RUN apt-get update && apt-get install -y sasl2-bin libuuid1 libnss3 libnspr4 xqilla libboost-program-options${BOOST_VERSION}.0 libboost-filesystem${BOOST_VERSION}.0
+# Build-time dependencies
+RUN apt-get update && apt-get install -y python3-setuptools cmake g++ && \
+pip3 install python-qpid-proton && \
+apt-get purge -y python3-setuptools cmake g++ && \
+apt-get autoremove -y --purge
-# Install
-# QPID daemon legacy store would require: libaio-dev libdb5.1++-dev
-RUN apt-get update && apt-get install -y subversion swig ruby ruby-dev python-dev python3-dev libsasl2-dev pkg-config cmake libtool uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man fakeroot build-essential debhelper libsslcommon2-dev libxqilla-dev python3-setuptools libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
- mkdir ${INSTALLDIR}/qpid && \
- svn --non-interactive -q co ${LOFAR_BRANCH_URL}/LCS/MessageBus/qpid/ ${INSTALLDIR}/qpid && \
- bash -c "HOME=/tmp ${INSTALLDIR}/qpid/local/sbin/build_qpid" && \
- bash -c "strip ${INSTALLDIR}/qpid/{bin,lib}/* || true" && \
- bash -c "rm -rf /tmp/sources" && \
- apt-get purge -y subversion swig ruby ruby-dev python-dev python3-dev libsasl2-dev pkg-config cmake libtool uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man fakeroot build-essential debhelper libsslcommon2-dev libxqilla-dev python3-setuptools libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
- apt-get autoremove -y --purge
-#
# *******************
# DAL
# *******************
--
GitLab