Merge remote-tracking branch 'origin/master' into TMSS-259

CMake/variants/variants.lcs157

@@ -2,6 +2,7 @@
 # AS: put under comment as LOFAR general rule is to use shared libs now. 
 #option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 
+set(PYTHON_EXECUTABLE "/usr/bin/python3.6" CACHE FILEPATH "")
 set(WINCC_ROOT_DIR /opt/WinCC_OA/3.16)
 set(CASACORE_ROOT_DIR "/opt/casacore")
 set(CASAREST_ROOT_DIR "/opt/casarest")

Docker/lofar-outputproc/Dockerfile.tmpl

@@ -5,6 +5,9 @@ FROM lofar-base:${LOFAR_TAG}
 
 RUN apt-get update && apt-get install -y git python python3 g++ make
 
+# Consume superfluous build variables
+ENV DOCKER_IMAGE_BUILD_DATE=${DOCKER_IMAGE_BUILD_DATE}
+
 #
 # *******************
 #   Blitz
@@ -24,7 +27,7 @@ RUN apt-get update && apt-get install -y git python && \
 # *******************
 #
 
-ENV DAL_VERSION=v3.3.1
+ENV DAL_VERSION=v3.3.2
 
 # Run-time dependencies
 RUN aptitude install -y libhdf5-${LIBHDF5_VERSION} python3 && \
@@ -55,7 +58,7 @@ RUN apt-get update && apt-get install -y binutils liblog4cplus-1.1-9 libxml2 lib
 
 # Tell image build information
 ENV LOFAR_BRANCH=${LOFAR_VERSION} \
-    LOFAR_BUILDVARIANT=gnucxx11_opt
+    LOFAR_BUILDVARIANT=${LOFAR_BUILDVARIANT}
 
 # Install
 RUN apt-get update && apt-get install -y git cmake g++ gfortran bison flex autogen liblog4cplus-dev libhdf5-dev libboost-dev boost-python${BOOST_VERSION}-dev libxml2-dev pkg-config libpng-dev libfftw3-dev libunittest++-dev libxml++2.6-dev libboost-filesystem${BOOST_VERSION}-dev libboost-date-time${BOOST_VERSION}-dev libboost-thread${BOOST_VERSION}-dev libboost-regex${BOOST_VERSION}-dev binutils-dev libopenblas-dev libcfitsio-dev wcslib-dev libcap2-bin libreadline-dev && \

SAS/TMSS/src/CMakeLists.txt

 
 set(USE_PYTHON_COMPILATION Off)
-lofar_find_package(PythonInterp 3.4 REQUIRED)
+lofar_find_package(PythonInterp 3.5 REQUIRED)
 #lofar_find_package(PostgreSQL 9.4)
 
 include(PythonInstall)