From 2f4b59857d8b0ca050dd266b0ab422d8abb46c4c Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Wed, 27 Nov 2019 00:22:43 +0100
Subject: [PATCH] Add newer version of python-casacore
Former-commit-id: 0752c260574481f3d1273b49ae01bc6e5b2ae5a4
---
Docker/Dockerfile | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
index a24a7b09..44bcd937 100644
--- a/Docker/Dockerfile
+++ b/Docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM kernsuite/base:4 as builder
+FROM kernsuite/base:5 as builder
SHELL ["/bin/bash", "-c"]
RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -14,7 +14,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
build-essential \
libhdf5-serial-dev \
libarmadillo-dev \
- lofar-dev \
libboost-filesystem-dev \
libboost-system-dev \
libboost-date-time-dev \
@@ -77,6 +76,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get install -y \
aoflagger \
casacore-data \
+ casacore-dev \
libarmadillo8 \
libboost-date-time1.65.1 \
libboost-filesystem1.65.1 \
@@ -85,6 +85,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libboost-system1.65.1 \
libboost-signals1.65.1 \
libboost-test1.65.1 \
+ libboost-python1.65-dev \
libcfitsio5 \
libgtkmm-3.0 \
libfftw3-3 \
@@ -92,8 +93,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
libpng16-16 \
libstationresponse0 \
libxml2 \
- python3 \
- python3-casacore \
+ python3.7 \
python3-numpy \
python3-scipy && \
rm -rf /var/lib/apt/lists/*
@@ -120,10 +120,11 @@ ARG Dysco_TAG=master
LABEL Dysco.version.tag=${Dysco_TAG}
-RUN apt-get update && apt-get install -y nodejs python3-pip git wsclean
+RUN apt update && apt install -y nodejs python3-pip git wsclean libcasa-python3-2 wcslib-dev libcfitsio-dev
RUN python3 -m pip install cwltool cwl-runner -e "git://github.com/darafferty/LSMTool.git@${LSMTool_TAG}#egg=LSMTool" \
"toil[cwl]"==${TOIL_VERSION} \
- matplotlib
+ matplotlib \
+ python-casacore
RUN python3 -m pip install -e "git+https://github.com/revoltek/losoto.git@${LoSoTo_TAG}#egg=LoSoTo"
--
GitLab