diff --git a/CAL/Docker/HolographyBase/Dockerfile b/CAL/Docker/HolographyBase/Dockerfile index 04a122d546ee7d3199455d8685ff71c5a0b9c706..c4e928e06968c1217db2b3536d6c08a6b7c2841b 100644 --- a/CAL/Docker/HolographyBase/Dockerfile +++ b/CAL/Docker/HolographyBase/Dockerfile @@ -15,7 +15,10 @@ RUN apt-get update && apt-get -y install \ python3-emcee \ python3-numba \ libfftw3-bin \ - libboost-python1.65.1 + libboost-python1.65.1 \ + gsl-bin \ + libhdf5-100 \ + libopenblas-base RUN pip3 install dataclasses \ scipy @@ -69,9 +72,27 @@ RUN mkdir -p /root/src/python-casacore && \ python3 setup.py install --prefix=/opt/python-casacore ## DEALING WITH DYSCO -RUN apt install -y dysco-dev +# +# ******************* +# DYSCO +# ******************* +# +# Run-time dependencies +RUN apt install -y doxygen libboost-date-time-dev libopenblas-dev libgsl-dev +RUN mkdir /root/src/dysco && \ + cd /root/src/dysco && \ + wget https://github.com/aroffringa/dysco/archive/v1.2.tar.gz && \ + tar -xvf v1.2.tar.gz && \ + rm v1.2.tar.gz && \ + mkdir build && \ + cd build && \ + cmake -DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DPORTABLE=True -DCMAKE_INSTALL_PREFIX=/opt/dysco/ -DCASACORE_ROOT_DIR=/opt/casacore/ /root/src/dysco/dysco-1.2 && \ + make -j 5 && \ + make install FROM base +ENV PYTHONPATH=/opt/dysco/lib/python3.6/site-packages:/opt/dysco/lib64/python3.6/site-packages:${PYTHONPATH} COPY --from=base-build /opt/casacore/ /opt/casacore/ COPY --from=base-build /opt/python-casacore/ /opt/python-casacore/ +COPY --from=base-build /opt/dysco/ /opt/dysco/ diff --git a/CAL/Docker/HolographyDeploy/Dockerfile b/CAL/Docker/HolographyDeploy/Dockerfile index 34e9436b62f3ae88ede6ec139b8fd5b296621342..f3ebc351b2cd7606c1ada6691b662197cbc0999c 100644 --- a/CAL/Docker/HolographyDeploy/Dockerfile +++ b/CAL/Docker/HolographyDeploy/Dockerfile @@ -3,11 +3,12 @@ COPY --from=holography-build:latest /opt/lofar /opt/lofar COPY ./entrypoint.sh /entrypoint.sh -ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/casacore/lib/ +ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/casacore/lib/:/opt/dysco/lib -ENV PYTHONPATH=/opt/python-casacore/lib/python3.6/site-packages/ +ENV PYTHONPATH=$PYTHONPATH:/opt/python-casacore/lib/python3.6/site-packages/ RUN mkdir /WORKDIR && chmod 777 /WORKDIR WORKDIR /WORKDIR + RUN chmod 777 /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"]