diff --git a/README.md b/README.md index 992829a7..a1e0295c 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ RASCIL can be installed using pip:: You may also need the rascil data for simulations: - wget https://timcornwell.gitlab.io/rascil/rascil_data.tgz + curl https://timcornwell.gitlab.io/rascil/rascil_data.tgz -o rascil.data.tgz tar zxf rascil_data.tgz export RASCIL_DATA=`pwd`/rascil_data diff --git a/docker/rascil-no-data/Dockerfile b/docker/rascil-no-data/Dockerfile index 8dd1302c..6e1e02a6 100644 --- a/docker/rascil-no-data/Dockerfile +++ b/docker/rascil-no-data/Dockerfile @@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get install -y \ ca-certificates \ - gosu git \ + gosu git wget curl \ libxml2-dev liblapack-dev libcfitsio-dev libgtkmm-3.0-dev \ cmake g++ build-essential gfortran libpng-dev casacore-dev \ python3 python3-dev python3-pip python3-setuptools && \ @@ -44,7 +44,7 @@ RUN pip3 install Cython setuptools && \ jupyter_contrib_nbextensions \ jupyter-server-proxy \ jupyterlab \ - matplotlib \ + "matplotlib<3.1.3" \ photutils\ python-casacore \ reproject \ @@ -58,4 +58,4 @@ RUN pip3 install Cython setuptools && \ # Use entrypoint script to create a user on the fly and avoid running as root. RUN chmod +x /rascil/entrypoint.sh ENTRYPOINT ["/rascil/entrypoint.sh"] -CMD ["/bin/bash"] \ No newline at end of file +CMD ["/bin/bash"] diff --git a/docker/rascil-pip/Dockerfile b/docker/rascil-pip/Dockerfile index ed0c2d50..2b1c5fe9 100644 --- a/docker/rascil-pip/Dockerfile +++ b/docker/rascil-pip/Dockerfile @@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && apt-get install -y \ ca-certificates \ - gosu git \ + gosu git curl \ libxml2-dev liblapack-dev libcfitsio-dev libgtkmm-3.0-dev \ cmake g++ build-essential gfortran libpng-dev casacore-dev \ python3 python3-dev python3-pip python3-setuptools && \ diff --git a/docs/RASCIL_install.rst b/docs/RASCIL_install.rst index ec947ee2..45de4c8a 100644 --- a/docs/RASCIL_install.rst +++ b/docs/RASCIL_install.rst @@ -14,7 +14,7 @@ If you just wish to run the package and do not intend to run simulations or test For simulations, you can add the data in a separate step:: - wget https://timcornwell.gitlab.io/rascil/rascil_data.tgz + curl https://timcornwell.gitlab.io/rascil/rascil_data.tgz -o rascil.data.tgz tar zxf rascil_data.tgz export RASCIL_DATA=`pwd`/rascil_data