Merge branch 'bugfix/docker' into 'master'

fix dependencies

See merge request marius/shakemapi!2

Dockerfile

@@ -4,6 +4,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
     gmt \
     libhdf5-dev \
     pkg-config \
+    gfortran \
+    libopenblas-dev \
+    liblapack-dev \
+    software-properties-common \
     postgresql
 
 RUN mkdir /data/
@@ -15,6 +19,9 @@ WORKDIR /src/
 COPY . /src/
 RUN pip3 install -r /src/requirements.txt --use-feature=2020-resolver
 
+# This will pull in a newer version of numpy. Pip will complain but accept this.
+RUN pip3 install --upgrade numpy
+
 ENV VS30PATH="/data/global_vs30.grd"
 
 CMD python3 src/api.py

requirements.txt

-psycopg2-binary
-postgis
 obspy
 pandas
-aiopg
-h5py
-asyncio
-aiohttp
-aiohttp_cors
-openquake.engine
+aiopg==1.3.3
+postgis==1.0.4
+psycopg2==2.9.2
+aiohttp==3.6.2
+aiohttp-cors==0.7.0
+async-timeout==3.0.1
+asyncio==3.4.3
+attrs==19.3.0
+backports.entry-points-selectable==1.1.0
+certifi==2019.9.11
+chardet==3.0.4
+cycler==0.10.0
+decorator==4.4.1
+distlib==0.3.2
+Django==2.2.7
+docutils==0.14
+filelock==3.0.12
+idna==2.8
+kiwisolver==1.1.0
+matplotlib==3.1.1
+multidict==4.5.2
+openquake.engine==3.10.1
+pipenv==2021.5.29
+platformdirs==2.3.0
+psutil==5.6.5
+pyparsing==2.4.5
+pyshp==1.2.3
+python-dateutil==2.8.1
+pytz==2019.3
+six==1.16.0
+virtualenv==20.7.2
+virtualenv-clone==0.5.7