From 491f72d803c0a35d6c918aba4f72d1d923dd39f8 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Thu, 11 Jun 2020 11:41:46 +0000
Subject: [PATCH] Removed casarest from Docker images as it's not needed
anymore.
---
Docker/dynspec/Dockerfile | 1 -
Docker/lofar-base/Dockerfile.tmpl | 22 ----------------
Docker/lofar-base/_Dockerfile_ABI0.tmpl_ | 27 --------------------
Docker/lofar-ci/Dockerfile_ci_cep | 8 ------
Docker/lofar-documentation/Dockerfile | 19 --------------
Docker/lofar-pipeline/Dockerfile.tmpl | 2 +-
Docker/lofar-pipeline/_Dockerfile_ABI0.tmpl_ | 2 +-
Docker/lofar-tbbwriter/Dockerfile | 1 -
8 files changed, 2 insertions(+), 80 deletions(-)
diff --git a/Docker/dynspec/Dockerfile b/Docker/dynspec/Dockerfile
index 1f2c63f57e2..c0b19bc4e7c 100644
--- a/Docker/dynspec/Dockerfile
+++ b/Docker/dynspec/Dockerfile
@@ -21,7 +21,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
# Remove casacore?
#
ENV CASACORE_VERSION=2.0.3 \
- CASAREST_VERSION=1.4.1 \
PYTHON_CASACORE_VERSION=2.0.1 \
BOOST_VERSION=1.48
diff --git a/Docker/lofar-base/Dockerfile.tmpl b/Docker/lofar-base/Dockerfile.tmpl
index b32d6d4e736..6ed1f69cb4c 100644
--- a/Docker/lofar-base/Dockerfile.tmpl
+++ b/Docker/lofar-base/Dockerfile.tmpl
@@ -48,7 +48,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
# versions
#
ENV CASACORE_VERSION=v3.1.0 \
- CASAREST_VERSION=1.5.0 \
PYTHON_CASACORE_VERSION=v3.0.0 \
BOOST_VERSION=1.65 \
LIBHDF5_VERSION=100 \
@@ -120,27 +119,6 @@ RUN export BUILD_PACKAGES="wget git cmake g++ gfortran flex bison libreadline-de
COPY ["casarc", "${INSTALLDIR}/"]
ENV CASARCFILES=${INSTALLDIR}/casarc
-#
-# *******************
-# Casarest
-# *******************
-#
-# Run-time dependencies
-RUN aptitude install -y libboost-system${BOOST_VERSION}.1 libboost-thread${BOOST_VERSION}.1
-
-# Install
-RUN export BUILD_PACKAGES="git cmake g++ gfortran libboost-system${BOOST_VERSION}-dev libboost-thread${BOOST_VERSION}-dev libcfitsio-dev wcslib-dev libopenblas-dev" && \
- aptitude install -y ${BUILD_PACKAGES} && \
- mkdir -p ${INSTALLDIR}/casarest/build && \
- cd ${INSTALLDIR}/casarest && git clone --depth 1 --shallow-submodules --branch ${CASAREST_VERSION//latest/master} https://github.com/casacore/casarest.git src && \
- cd ${INSTALLDIR}/casarest/build && cmake -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/casarest -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -DNDEBUG" ../src/ && \
- cd ${INSTALLDIR}/casarest/build && make -j ${J} && \
- cd ${INSTALLDIR}/casarest/build && make install && \
- bash -c "strip ${INSTALLDIR}/casarest/{lib,bin}/* || true" && \
- bash -c "rm -rf ${INSTALLDIR}/casarest/{build,src}" && \
- aptitude purge -y ${BUILD_PACKAGES} && \
- aptitude clean && \
- aptitude autoclean
#
# *******************
diff --git a/Docker/lofar-base/_Dockerfile_ABI0.tmpl_ b/Docker/lofar-base/_Dockerfile_ABI0.tmpl_
index db986ebf1e3..5c791ccdec4 100644
--- a/Docker/lofar-base/_Dockerfile_ABI0.tmpl_
+++ b/Docker/lofar-base/_Dockerfile_ABI0.tmpl_
@@ -43,9 +43,7 @@ ENV DEBIAN_FRONTEND=noninteractive \
#
# versions
#
-# Attention! casacore < 3.0.0 requires casarest 1.4.2!
ENV CASACORE_VERSION=v2.2.0 \
- CASAREST_VERSION=2350d906194979d70448bf869bf628c24a0e4c19 \
PYTHON_CASACORE_VERSION=v2.1.2 \
BOOST_VERSION=1.62 \
LIBHDF5_VERSION=100 \
@@ -171,31 +169,6 @@ RUN export BUILD_PACKAGES="wget git cmake g++ gfortran flex bison libreadline-de
COPY ["casarc", "${INSTALLDIR}/"]
ENV CASARCFILES=${INSTALLDIR}/casarc
-#
-# *******************
-# Casarest
-# *******************
-#
-# Run-time dependencies
-# RUN apt-get install -y libboost-system${BOOST_VERSION} libboost-thread${BOOST_VERSION}
-
-# Install
-RUN export BUILD_PACKAGES="git cmake g++ gfortran libcfitsio-dev wcslib-dev libopenblas-dev" && \
- apt-get install -y ${BUILD_PACKAGES} && \
- mkdir -p ${INSTALLDIR}/casarest/build && \
- cd ${INSTALLDIR}/casarest && git clone https://github.com/casacore/casarest.git src && \
- cd ${INSTALLDIR}/casarest/src && git checkout ${CASAREST_VERSION//latest/master} && \
- cd ${INSTALLDIR}/casarest/build && cmake -DBOOST_ROOT=${INSTALLDIR}/boost -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/casarest -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="${CXX_FLAGS} -DNDEBUG" ../src/ && \
- cd ${INSTALLDIR}/casarest/build && make -j ${J} && \
- cd ${INSTALLDIR}/casarest/build && make install && \
- bash -c "strip ${INSTALLDIR}/casarest/{lib,bin}/* || true" && \
- bash -c "rm -rf ${INSTALLDIR}/casarest/{build,src}" && \
- apt-get purge -y ${BUILD_PACKAGES} && \
- apt-get clean -y && \
- apt-get autoclean -y && \
- apt-get autoremove -y --purge
-
-
#
# *******************
# Python-casacore
diff --git a/Docker/lofar-ci/Dockerfile_ci_cep b/Docker/lofar-ci/Dockerfile_ci_cep
index e9666324b73..77ced642d31 100644
--- a/Docker/lofar-ci/Dockerfile_ci_cep
+++ b/Docker/lofar-ci/Dockerfile_ci_cep
@@ -16,11 +16,3 @@ RUN echo "Installing Casacore..." && \
cmake -DCMAKE_INSTALL_PREFIX=/opt/casacore -DBUILD_PYTHON3=ON -DBUILD_PYTHON=OFF -DPYTHON_EXECUTABLE=/usr/bin/python3 -DUSE_OPENMP=ON -DUSE_FFTW3=TRUE -DUSE_HDF5=ON -DCMAKE_BUILD_TYPE=Release .. && \
make && \
make install
-
-RUN echo "Installing Casarest..." && \
- cd / && git clone https://github.com/casacore/casarest.git && \
- mkdir -p /casarest/build/ && \
- cd /casarest/build/ && \
- cmake -DCMAKE_INSTALL_PREFIX=/opt/casarest -DCASACORE_ROOT_DIR=/opt/casacore -DCMAKE_BUILD_TYPE=Release .. && \
- make && \
- make install
\ No newline at end of file
diff --git a/Docker/lofar-documentation/Dockerfile b/Docker/lofar-documentation/Dockerfile
index 89db61505b0..4d94011c0d8 100644
--- a/Docker/lofar-documentation/Dockerfile
+++ b/Docker/lofar-documentation/Dockerfile
@@ -191,25 +191,6 @@ RUN wget -O /opt/downloads/casacore-2.1.0.tar.gz https://github.com/casacore/cas
ln -s /opt/casacore-2.1.0 /opt/casacore && \
rm /opt/downloads/casacore-2.1.0.tar.gz
-RUN wget -O /opt/downloads/casarest-1.4.2.tar.gz https://github.com/casacore/casarest/archive/v1.4.2.tar.gz && \
- mkdir -p /opt/casarest-1.4.2/build && \
- tar -xzf /opt/downloads/casarest-1.4.2.tar.gz -C /opt/casarest-1.4.2 && \
- cd /opt/casarest-1.4.2/build && \
- cmake \
- -DDATA_DIR=/usr/share/casacore/data \
- -DUSE_FFTW3=ON \
- -DBUILD_PYTHON=ON \
- -DUSE_THREADS=ON \
- -DCXX11=ON \
- -DCMAKE_INSTALL_PREFIX=/opt/casarest-1.4.2 \
- -DCASACORE_ROOT_DIR=/opt/casacore \
- -DCFITSIO_INCLUDE_DIR=/usr/include/cfitsio \
- ../casarest-1.4.2 && \
- make -j4 && \
- make install && \
- ln -s /opt/casarest-1.4.2 /opt/casarest && \
- rm /opt/downloads/casarest-1.4.2.tar.gz
-
RUN wget -O /opt/downloads/aoflagger-2.9.0.tar.bz2 https://sourceforge.net/projects/aoflagger/files/aoflagger-2.9.0/aoflagger-2.9.0.tar.bz2/download && \
mkdir -p /opt/aoflagger-2.9.0/build && \
tar -xjf /opt/downloads/aoflagger-2.9.0.tar.bz2 -C /opt/aoflagger-2.9.0 && \
diff --git a/Docker/lofar-pipeline/Dockerfile.tmpl b/Docker/lofar-pipeline/Dockerfile.tmpl
index 8c772e3c6f4..d412941b1d5 100644
--- a/Docker/lofar-pipeline/Dockerfile.tmpl
+++ b/Docker/lofar-pipeline/Dockerfile.tmpl
@@ -231,7 +231,7 @@ RUN export BUILD_PACKAGES="git cmake g++ gfortran python3-setuptools bison flex
git clone --depth 1 --shallow-submodules --branch ${LOFAR_VERSION//latest/master} https://git.astron.nl/ro/lofar.git ${INSTALLDIR}/lofar/src && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && \
sed -i "s/ABI=0/ABI=${CXX_ABI}/g" ../../src/CMake/variants/GNUCXX11.cmake && \
- cmake -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_PACKAGES=Offline -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/lofar/ -DPYTHON_EXECUTABLE=/usr/bin/python3 -DCASAREST_ROOT_DIR=${INSTALLDIR}/casarest/ -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore/ -DBLITZ_ROOT_DIR=${INSTALLDIR}/blitz -DAOFLAGGER_ROOT_DIR=${INSTALLDIR}/aoflagger/ -DBDSF_ROOT_DIR=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ -DQPID_ROOT_DIR=/opt/qpid/ -DUSE_OPENMP=True ${INSTALLDIR}/lofar/src/ && \
+ cmake -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_PACKAGES=Offline -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/lofar/ -DPYTHON_EXECUTABLE=/usr/bin/python3 -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore/ -DBLITZ_ROOT_DIR=${INSTALLDIR}/blitz -DAOFLAGGER_ROOT_DIR=${INSTALLDIR}/aoflagger/ -DBDSF_ROOT_DIR=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ -DQPID_ROOT_DIR=/opt/qpid/ -DUSE_OPENMP=True ${INSTALLDIR}/lofar/src/ && \
sed -i '29,31d' include/ApplCommon/PosixTime.h && \
make -j ${J} && \
make install && \
diff --git a/Docker/lofar-pipeline/_Dockerfile_ABI0.tmpl_ b/Docker/lofar-pipeline/_Dockerfile_ABI0.tmpl_
index 2128cb5219b..bb1f9bc845d 100644
--- a/Docker/lofar-pipeline/_Dockerfile_ABI0.tmpl_
+++ b/Docker/lofar-pipeline/_Dockerfile_ABI0.tmpl_
@@ -236,7 +236,7 @@ RUN export BUILD_PACKAGES="git cmake g++ gfortran python-setuptools bison flex l
mkdir -p ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && \
git clone --branch ${LOFAR_VERSION//latest/master} https://git.astron.nl/LOFAR ${INSTALLDIR}/lofar/src && \
cd ${INSTALLDIR}/lofar/build/${LOFAR_BUILDVARIANT} && \
- HDF5_ROOT=${INSTALLDIR}/libhdf5 PYTHONPATH=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages cmake -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_PACKAGES=Offline -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/lofar/ -DCASAREST_ROOT_DIR=${INSTALLDIR}/casarest/ -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore/ -DBLITZ_ROOT_DIR=${INSTALLDIR}/blitz -DAOFLAGGER_ROOT_DIR=${INSTALLDIR}/aoflagger/ -DBDSF_ROOT_DIR=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ -DQPID_ROOT_DIR=${INSTALLDIR}/qpid/ -DHDF5_hdf5_hl_LIBRARY_RELEASE:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_hl-shared.so -DHDF5_hdf5_hl_LIBRARY_DEBUG:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_hl-shared.so -DHDF5_hdf5_cpp_LIBRARY_RELEASE:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_cpp-shared.so -DHDF5_hdf5_cpp_LIBRARY_DEBUG:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_cpp-shared.so -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5-shared.so -DHDF5_hdf5_LIBRARY_DEBUG:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5-shared.so -DUSE_OPENMP=True ${INSTALLDIR}/lofar/src/ && \
+ HDF5_ROOT=${INSTALLDIR}/libhdf5 PYTHONPATH=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages cmake -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DBUILD_PACKAGES=Offline -DBUILD_TESTING=OFF -DCMAKE_INSTALL_PREFIX=${INSTALLDIR}/lofar/ -DCASACORE_ROOT_DIR=${INSTALLDIR}/casacore/ -DBLITZ_ROOT_DIR=${INSTALLDIR}/blitz -DAOFLAGGER_ROOT_DIR=${INSTALLDIR}/aoflagger/ -DBDSF_ROOT_DIR=${INSTALLDIR}/pybdsf/lib/python${PYTHON_VERSION}/site-packages/ -DQPID_ROOT_DIR=${INSTALLDIR}/qpid/ -DHDF5_hdf5_hl_LIBRARY_RELEASE:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_hl-shared.so -DHDF5_hdf5_hl_LIBRARY_DEBUG:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_hl-shared.so -DHDF5_hdf5_cpp_LIBRARY_RELEASE:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_cpp-shared.so -DHDF5_hdf5_cpp_LIBRARY_DEBUG:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5_cpp-shared.so -DHDF5_hdf5_LIBRARY_RELEASE:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5-shared.so -DHDF5_hdf5_LIBRARY_DEBUG:FILEPATH=${INSTALLDIR}/libhdf5/lib/libhdf5-shared.so -DUSE_OPENMP=True ${INSTALLDIR}/lofar/src/ && \
sed -i '29,31d' include/ApplCommon/PosixTime.h && \
make -j ${J} && \
make install && \
diff --git a/Docker/lofar-tbbwriter/Dockerfile b/Docker/lofar-tbbwriter/Dockerfile
index 8b604c8ca55..bd6b253b281 100644
--- a/Docker/lofar-tbbwriter/Dockerfile
+++ b/Docker/lofar-tbbwriter/Dockerfile
@@ -21,7 +21,6 @@ ENV DEBIAN_FRONTEND=noninteractive \
# Remove casacore?
#
ENV CASACORE_VERSION=2.0.3 \
- CASAREST_VERSION=1.4.1 \
PYTHON_CASACORE_VERSION=2.0.1 \
BOOST_VERSION=1.48
--
GitLab