diff --git a/Docker/lofar-base/Dockerfile.tmpl b/Docker/lofar-base/Dockerfile.tmpl index 8a69392110952d5c7b4155954b01d925fce6bfcd..a5d794b7006f5f0abf7442f56100fe986c6f1c32 100644 --- a/Docker/lofar-base/Dockerfile.tmpl +++ b/Docker/lofar-base/Dockerfile.tmpl @@ -119,8 +119,6 @@ RUN sudo apt-get install -y git make g++ python-setuptools libboost-python-dev l # ******************* # -ENV LOFAR_BRANCH=trunk - # Allow auto-checkout from lofar repo RUN mkdir /home/${USER}/.subversion COPY subversion_servers /home/${USER}/.subversion/servers @@ -133,7 +131,7 @@ RUN sudo apt-get install -y sasl2-bin libuuid1 libnss3 libnspr4 xqilla libboost- # QPID daemon legacy store would require: libaio-dev libdb5.1++-dev RUN sudo 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 && \ mkdir /opt/qpid && \ - svn --non-interactive -q --username lofar-guest --password lofar-guest co https://svn.astron.nl/LOFAR/${LOFAR_BRANCH}/LCS/MessageBus/qpid/ /opt/qpid; \ + svn --non-interactive -q --username lofar-guest --password lofar-guest co https://svn.astron.nl/LOFAR/${LOFAR_BRANCH_NAME}/LCS/MessageBus/qpid/ /opt/qpid; \ /opt/qpid/local/sbin/build_qpid && \ bash -c "strip /opt/qpid/{bin,lib}/* || true" && \ bash -c "rm -rf ~/sources" && \