diff --git a/Dockerfile b/Dockerfile index da41619..1274bba 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,11 +34,13 @@ WORKDIR /opt/marblecutter COPY requirements-server.txt /opt/marblecutter/ COPY requirements.txt /opt/marblecutter/ -RUN pip install -U numpy && \ +RUN pip install -U numpy~=1.16.0 && \ pip install -r requirements-server.txt && \ rm -rf /root/.cache +COPY templates /opt/marblecutter/templates COPY virtual /opt/marblecutter/virtual +COPY server.py /opt/marblecutter/server.py USER nobody diff --git a/README.md b/README.md index da59383..e5e220e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # marblecutter-virtual +![Docker Cloud Automated build](https://img.shields.io/docker/cloud/automated/olivierdalang/marblecutter-virtual.svg) + I am a tile server for HTTP(S)-accessible [Cloud Optimized GeoTIFFs (COGs)](http://www.cogeo.org/). diff --git a/requirements-server.txt b/requirements-server.txt index cc2c7b6..c64970d 100644 --- a/requirements-server.txt +++ b/requirements-server.txt @@ -1,4 +1,4 @@ -r requirements.txt gevent -gunicorn +gunicorn<20 diff --git a/requirements.txt b/requirements.txt index e6500f8..6f272e6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,10 @@ cachetools ~= 2.0.0 flask-cors +Pillow < 7 # marblecutter[web] ~= 0.3.1 https://github.com/mojodna/marblecutter/archive/5b9040b.tar.gz#egg=marblecutter[web] rasterio[s3] ~= 1.0 -numpy +numpy ~= 1.16.0 serverless-wsgi # temporary workaround for https://github.com/mapbox/rasterio/issues/1651 mock \ No newline at end of file diff --git a/virtual/web.py b/virtual/web.py index e4fb40a..086581b 100644 --- a/virtual/web.py +++ b/virtual/web.py @@ -23,6 +23,7 @@ from .catalogs import VirtualCatalog +logging.basicConfig() LOG = logging.getLogger(__name__) IMAGE_TRANSFORMATION = Image()