From d3cbb9186fa7c1d695b104b3ffb186fc18e99546 Mon Sep 17 00:00:00 2001 From: shahar s Date: Wed, 10 Aug 2022 14:10:12 +0300 Subject: [PATCH] feat: upgraded docker to mapproxy 1.15 + cleanup --- Dockerfile | 28 ++++++++++++++++++------ requirements.txt | 55 +++++++++++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 677582e..463565b 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,41 @@ #--------- Generic stuff all our Dockerfiles should start with so we get caching ------------ -FROM python:3.7.10 +FROM python:3.10.6 MAINTAINER Tim Sutton #-------------Application Specific Stuff ---------------------------------------------------- RUN apt-get -y update && \ apt-get install -y \ - gettext \ - python-yaml \ + python3-virtualenv \ libgeos-dev \ - python-lxml \ + python3-lxml \ libgdal-dev \ + #built pillow + #python-pil \ + #depecndencies for using new pillow source build-essential \ python-dev \ libjpeg-dev \ zlib1g-dev \ - libfreetype6-dev \ - python-virtualenv + libfreetype6-dev +#pip is used instead of the following +#python-yaml \ +#python-shaply \ +#libproj12 \ + + +# gettext \ +#gosu awscli; \ +# verify that the binary works +#gosu nobody true COPY requirements.txt /requirements.txt RUN pip install -r requirements.txt +# Cleanup resources +RUN apt-get -y --purge autoremove \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* + EXPOSE 8080 ENV \ # Run diff --git a/requirements.txt b/requirements.txt index c90cb98..308ff72 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,14 +1,39 @@ -asgiref==3.4.1 -backoff==1.10.0 -boto3==1.18.32 -botocore==1.21.32 -Deprecated==1.2.12 +# asgiref==3.4.1 +# backoff==1.10.0 +# Deprecated==1.2.12 +# numpy==1.21.5 +# typing-extensions==3.10.0.2 + + +#map proxy +Pillow==8.4.0 +PyYAML==5.4 +Shapely==1.7.1 +pyproj==3.2.1 +MapProxy==1.15.1 +boto3==1.24.7 +botocore==1.27.7 +#s3cmd +#requests==2.24.0 +#riak==2.7.0 +#redis==3.5.3 +# jmespath==0.10.0 +# python-dateutil==2.8.2 +# s3transfer==0.6.0 +# six==1.16.0 +# urllib3==1.26.6 +# wrapt==1.12.1 + +#uwsgi +uWSGI==2.0.20 +wsgicors==0.7.0 + +# open telemetry +protobuf==3.17.3 googleapis-common-protos==1.53.0 grpcio==1.39.0 -jmespath==0.10.0 -MapProxy==1.13.2 -numpy==1.21.5 opentelemetry-api==1.7.1 +opentelemetry-sdk==1.7.1 opentelemetry-exporter-otlp==1.7.1 opentelemetry-exporter-otlp-proto-grpc==1.7.1 opentelemetry-distro==0.26b1 @@ -20,18 +45,4 @@ opentelemetry-instrumentation-sqlite3==0.26b1 opentelemetry-instrumentation-wsgi==0.26b1 # opentelemetry-instrumentation-logging==0.26b1 opentelemetry-proto==1.7.1 -opentelemetry-sdk==1.7.1 opentelemetry-semantic-conventions==0.26b1 -Pillow==8.3.1 -protobuf==3.17.3 -pyproj==3.2.1 -python-dateutil==2.8.2 -PyYAML==5.4.1 -s3transfer==0.5.0 -Shapely==1.7.1 -six==1.16.0 -typing-extensions==3.10.0.2 -urllib3==1.26.6 -uWSGI==2.0.20 -wrapt==1.12.1 -wsgicors==0.7.0