From 5b3aec54a1bf416ca2ef916f55476c3deb2deb2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Tue, 26 Mar 2019 16:03:12 +0000
Subject: [PATCH] SW-612: Correct mixed-up QPID run-tim installation
---
Docker/lofar-base/Dockerfile.tmpl | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/Docker/lofar-base/Dockerfile.tmpl b/Docker/lofar-base/Dockerfile.tmpl
index 89566058b35..29bf43a8c4e 100644
--- a/Docker/lofar-base/Dockerfile.tmpl
+++ b/Docker/lofar-base/Dockerfile.tmpl
@@ -109,14 +109,6 @@ RUN apt-get update && apt-get install -y git make g++ python3-setuptools libboos
apt-get purge -y git make g++ python3-setuptools libboost-python-dev libcfitsio3-dev wcslib-dev && \
apt-get autoremove -y --purge
-#
-# *******************
-# Apache Proton
-# *******************
-#
-RUN apt-get update && apt-get install -y libqpid-proton2 libqpidbroker2 libqpidclient2 libqpidcommon2 libqpidmessaging2 libqpidtypes1 python3-qpid-proton qpid-client qpid-proton-dump qpid-proton-dump
-
-
#
# *******************
# QPID client for C++ from LOFAR repo
@@ -125,6 +117,10 @@ RUN apt-get update && apt-get install -y libqpid-proton2 libqpidbroker2 libqpidc
# The LOFAR Offline package needs this until refactored!
#
+# 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
+
# 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 libsasl2-dev pkg-config cmake libtool uuid-dev libxerces-c-dev libnss3-dev libnspr4-dev help2man fakeroot build-essential debhelper libsslcommon2-dev libxqilla-dev python-setuptools libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
@@ -136,9 +132,13 @@ RUN apt-get update && apt-get install -y subversion swig ruby ruby-dev python-de
apt-get purge -y subversion swig ruby ruby-dev python-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 python-setuptools libboost-program-options${BOOST_VERSION}-dev libboost-filesystem${BOOST_VERSION}-dev && \
apt-get autoremove -y --purge
-# 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
+#
+# *******************
+# Apache Proton
+# *******************
+#
+RUN apt-get update && apt-get install -y libqpid-proton2 libqpidbroker2 libqpidclient2 libqpidcommon2 libqpidmessaging2 libqpidtypes1 python3-qpid-proton qpid-client qpid-proton-dump qpid-proton-dump
+
# *******************
# DAL
--
GitLab