diff --git a/Docker/lofar-pulp/Dockerfile b/Docker/lofar-pulp/Dockerfile index 89a9f7a1941c536e2c1e22d72af45d3eb47f8996..842566ff6a8369bd5cf46beac3e8f4c5c25c4fa0 100644 --- a/Docker/lofar-pulp/Dockerfile +++ b/Docker/lofar-pulp/Dockerfile @@ -51,12 +51,16 @@ RUN aptitude install -y python3-kombu ARG LOFAR_BUILDVARIANT=gnucxx11_optarch ENV LOFAR_BUILDVARIANT=${LOFAR_BUILDVARIANT} +# Pulp is still python2, so we need a LOFAR version that still builds CEP with python2. +ARG LOFAR_VERSION=LOFAR-Release-3_2_17 +ENV LOFAR_VERSION=${LOFAR_VERSION} + # Install #some are already installed, but we need boost, and RUN apt-get update && apt-get install -y subversion cmake g++ gfortran bison flex liblog4cplus-dev libhdf5-dev libblitz0-dev python-dev libxml2-dev pkg-config libunittest++-dev libxml++2.6-dev binutils-dev && \ RUN apt-get update && apt-get install -y liblog4cplus-dev libhdf5-dev libblitz0-dev libunittest++-dev libxml++2.6-dev binutils-dev && \ mkdir -p /opt/lofar/build/${LOFAR_BUILDVARIANT} /opt/lofar/src && \ git clone --depth=1 https://git.astron.nl/ro/lofar.git /opt/lofar/src && \ - if [ "${BASE_VERSION}" != "latest" ]; then cd /opt/lofar/src && git checkout ${BASE_VERSION}; fi && \ + if [ "${LOFAR_VERSION}" != "latest" ]; then cd /opt/lofar/src && git checkout ${LOFAR_VERSION}; fi && \ cd /opt/lofar/build/${LOFAR_BUILDVARIANT} && cmake -DBUILD_PACKAGES="Pipeline MessageBus OTDB_Services" -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=/opt/lofar/ -DCASACORE_ROOT_DIR=/opt/casacore/ -DQPID_ROOT_DIR=/opt/qpid/ -DUSE_OPENMP=True /opt/lofar/src/ && \ cd /opt/lofar/build/${LOFAR_BUILDVARIANT} && make -j ${J} && \ cd /opt/lofar/build/${LOFAR_BUILDVARIANT} && make install && \