From 05b13013229c59d18c70530d7f94bc264c89416c Mon Sep 17 00:00:00 2001 From: Edu Herraiz Aparicio Date: Thu, 16 Mar 2017 12:25:12 +0100 Subject: [PATCH] Upgrade thumbor 6.3.0 --- .travis.yml | 2 +- README.md | 9 ++++++--- remotecv/requirements.txt | 2 +- requirements-build.txt | 2 +- thumbor/conf/thumbor.conf.tpl | 14 +++++++++++++- thumbor/requirements.txt | 2 +- 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index fb0c75fa..013e4f5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ notifications: - gshark@gmail.com env: global: - - THUMBOR_VERSION=6.2.1 + - THUMBOR_VERSION=6.3.0 - secure: LSNYgDagNJrEBIZtAMXgGNaza66WniJNWVYpeZ00bxrqF2AJ/NLt9FGGvySDwJHcgqgD0SbsxD7EAefuZlBNq/68qvHFtnNZb5FoU6gjXW9Kvdlvtt6r5zcTvrPDwAlaGUi6iDnTxNd1YK+dQ5M5QPk6Vr3yAU2Pd/SjQtDTZU9TIUPIU2PHkzf/3mOV2VXrwfN4SR1XDe15Dk/dofDc0GWfvSQUedUZzEYGOT4yg5CNa1Zps10tD5rEsGaYoiBfJyTNaaXPufGbytqrJ0OyLXtkKevcVGQcCZn2RrBqwMatuOMdlsx5UxHbxSCHngtwQgIE7nKsuSQupW4R8MK9RmSWPy34rbaBAb3qWYBrmEQxBSeVFDShML+wunMWwjJ2Spugc4ER71PX4O97GtQB/4H9EyEFuDO9MnEIHX6GpRCS21NHVXUVAdrAHXfTGZBIvrOcAHh9y1idHeCsF92X0qBNkC+MNaAxWV+gvCZ+sZpDKrfoUMDI+nxff5B/Cb33++9iv4gWz01GJDVmK6YyTT0/6+KzHNU0mp7ji7wgvlTUDYCSTR1+11R9Aoalt07KfMJS1gGG8HuMFcSCV7z1btxWZUWKpC6WydXwJuVyQZg7g6HYJEEHxtpP8z81FWLhGQWk3qMpi5kxZrqDQ7IES8ibK1o1tyFMUCn0Jdm6Uyo= - secure: JHQ1g7ZWuO5IQhPd915so8pBPfMNp00rRRvNmewHaUXO33UnC6g1pFkTKsx5QpDi0QxdH0o0DYOXB1nvd1Y/cO3spW5P2dV0kfftr2GUTGKf6WTakZPfqowvZN6YKA+rI7eFaGnhrVLhzKhK5T5Gu9UHklPlndo6LvQxqQBuYI2uggSTK4M4zD5XWqEe6o0RJ89y6xX7DyqLKIkXF3N/RcoHLh7GSfNZNdaN/u/Nb1fQKTYIOiMVIPYYNm1DU4c/jsIxxJhxC60DgavC5rwCLQg5FXT5vQ6Ky41JRR0U3a23US3E0wMaHP1LvHP9o4jfFeA6pLG7zgceGkY+IKlsWPT2pr3nR71xCHEtZe2tPvAlwvgwIngliM06SIGrk0s5yuhD6Qvug9/DfAe96gD557WYEXXnT++ByW/+gGq3kiWBQlMqg9Z8N15WIA0qe+LUrkmw9MiuWkJyR3hP0Kidl/pv0AAM0oqqGuLiruPAsetk24lT2zh77t4wOI1jyGUwaqVHUlRHOegflXcRh9eAsBHFmXDJEkqLDs4yJ+oeMUnLyoLy24xJ1hvx41oVGbIQL0qTIikkN5i9qAU0hX8ZoBOwQN+WoffNC2+tEX0cDhTugKIg3YzHkHqYDmplCsElP8PAuCzxl0/P8W4CtHqn9F0FO+CgW3HLit9jJfHFYeA= - secure: b1+J/WngVLdn37ubp7iJLGHY3X5j95Ewk60mYOy4FAfdb6ofK6dtOUXTGHNjqMNsZDoZShjuFvB3+Qrz5VSzx2JT/R+hgqdr08Ft8powZYUPJUOBih+mZAo1ACgxhn/jHQsp/OUkD4Qe0PGRVqva10HQP55+SINH605b9/HGQdQwGhI++kvsqLaQZVcdKtFyetF+RkY70rXAsite53zd++2FYScvsjuf0ie5BTmPTyoOs1Cq8w1/+xVSb911F5m1KIJg8Z3O1zXL1XJ2IXAHoVGxuoCeGNw61RKEMp3VGZPeX/TBvFSbQ5alShmxgS6GPAcZFsWX/Lv6CdYOWoXjDKCTfrgvoElcn8AvBoZiNDf9aegnHZooHskoA4Bi+Tj83TDoZvB1qQvLWhD/ldZl+/9gBj/f3zO8FECK+RTDeN5MNgKWs/eg8lU9D1JRYw2JkN+AADUZlJXGZiZHGQDh03rsSfb0C4LpwulZwEWCTB5s1y22WwI+1Ec+S4TajqPInojn45qUIyH0sf/JPVYpCYAbbQWugwz+rrvuv90rPYNI8m73Fv2jk5a57P5t4+UBGS6UNfq8Kyj5d/b/hRznT4lvE3hvPwRjo07C4m+hPAJgPuRnFCZhaJ4E6b9zgdgKitaz/xGiosn2O4Y2apT5mNcgbHEq1v0j+P19CxDqDHg= diff --git a/README.md b/README.md index 1fd51a8c..9a5f521f 100644 --- a/README.md +++ b/README.md @@ -51,9 +51,6 @@ Check the docker-compose examples: * [Proposed use in production, reading from a AWS S3 and local cache of storage/result_storage](https://github.com/APSL/docker-thumbor/blob/master/configuration_examples/docker-compose/production.yml) -[![Deploy to Tutum](https://s.tutum.co/deploy-to-tutum.svg)](https://dashboard.tutum.co/stack/deploy/) - - Env vars and default value: ========= THUMBOR_LOG_FORMAT='%(asctime)s %(name)s:%(levelname)s %(message)s' @@ -65,6 +62,7 @@ Env vars and default value: ALLOWED_SOURCES=[] QUALITY=80 WEBP_QUALITY=None + PNG_COMPRESSION_LEVEL=6 AUTO_WEBP=False MAX_AGE=86400 MAX_AGE_TEMP_IMAGE=0 @@ -94,6 +92,11 @@ Env vars and default value: HTTP_LOADER_PROXY_PORT=None HTTP_LOADER_PROXY_USERNAME=None HTTP_LOADER_PROXY_PASSWORD=None + HTTP_LOADER_CA_CERTS=None + HTTP_LOADER_VALIDATE_CERTS=True + HTTP_LOADER_CLIENT_KEY=None + HTTP_LOADER_CLIENT_CERT=None + HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT=False STORAGE_EXPIRATION_SECONDS=2592000 STORES_CRYPTO_KEY_FOR_EACH_IMAGE=False FILE_STORAGE_ROOT_PATH='/data/storage' diff --git a/remotecv/requirements.txt b/remotecv/requirements.txt index 5294dbef..7e86f748 100644 --- a/remotecv/requirements.txt +++ b/remotecv/requirements.txt @@ -7,7 +7,7 @@ numpy==1.11.0 pyremotecv==0.5.0 remotecv==2.2.1 opencv-engine==1.0.1 -thumbor==6.2.1 +thumbor==6.3.0 raven==5.15.0 remotecv_aws==0.1 pgmagick==0.6.1 diff --git a/requirements-build.txt b/requirements-build.txt index 567c3613..aac5e89d 100644 --- a/requirements-build.txt +++ b/requirements-build.txt @@ -8,7 +8,7 @@ pyremotecv==0.5.0 #remotecv==2.2.1 git+https://github.com/APSL/remotecv.git opencv-engine==1.0.1 -thumbor==6.2.1 +thumbor==6.3.0 tc-aws==6.0.2 tc-core==0.4.0 tc-shortener==0.2.2 diff --git a/thumbor/conf/thumbor.conf.tpl b/thumbor/conf/thumbor.conf.tpl index fb77ec04..7349f0a1 100644 --- a/thumbor/conf/thumbor.conf.tpl +++ b/thumbor/conf/thumbor.conf.tpl @@ -76,6 +76,11 @@ PILLOW_RESAMPLING_FILTER = '{{ PILLOW_RESAMPLING_FILTER | default('LANCZOS') }}' ## Defaults to: None WEBP_QUALITY = {{ WEBP_QUALITY | default(None) }} + +## Compression level for generated PNG images. +## Defaults to: 6 +PNG_COMPRESSION_LEVEL = = {{ PNG_COMPRESSION_LEVEL | default(6) }} + ## Specifies whether WebP format should be used automatically if the request ## accepts it (via Accept header) ## Defaults to: False @@ -137,6 +142,8 @@ USE_BLACKLIST = {{ USE_BLACKLIST | default(False) }} ## Defaults to: 0 ENGINE_THREADPOOL_SIZE = {{ ENGINE_THREADPOOL_SIZE | default(0) }} + + ################################################################################ @@ -301,6 +308,10 @@ HTTP_LOADER_PROXY_PASSWORD = {{ HTTP_LOADER_PROXY_PASSWORD | default(None) }} ## Defaults to: None HTTP_LOADER_CA_CERTS = {{ HTTP_LOADER_CA_CERTS | default(None) }} +## Validate the server’s certificate for HTTPS requests +## Defaults to: True +HTTP_LOADER_VALIDATE_CERTS = {{ HTTP_LOADER_VALIDATE_CERTS | default(True) }} + ## The filename for client SSL key ## Defaults to: None HTTP_LOADER_CLIENT_KEY = {{ HTTP_LOADER_CLIENT_KEY | default(None) }} @@ -313,6 +324,7 @@ HTTP_LOADER_CLIENT_CERT = {{ HTTP_LOADER_CLIENT_CERT | default(None) }} ## Defaults to: False HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT = {{ HTTP_LOADER_CURL_ASYNC_HTTP_CLIENT | default(False) }} + ################################################################################ @@ -629,7 +641,7 @@ APP_CLASS = '{{ APP_CLASS | default('thumbor.app.ThumborServiceApp') }}' ############################## TC_AWS ########################################## TC_AWS_REGION = '{{ TC_AWS_REGION | default('eu-west-1') }}' # AWS Region -TC_AWS_ENDPOINT = {{ TC_AWS_ENDPOINT if TC_AWS_ENDPOINT | default(None) else None }} # Custom S3 endpoint URL (for GCP, Minio, etc.) +TC_AWS_ENDPOINT = {{ TC_AWS_ENDPOINT | default(None) }} # Custom S3 endpoint URL (for GCP, Minio, etc.) TC_AWS_STORAGE_BUCKET = '{{ TC_AWS_STORAGE_BUCKET | default('') }}' # S3 bucket for Storage TC_AWS_STORAGE_ROOT_PATH = '{{ TC_AWS_STORAGE_ROOT_PATH | default('') }}' # S3 path prefix for Storage bucket diff --git a/thumbor/requirements.txt b/thumbor/requirements.txt index b92ae31d..63f38c00 100644 --- a/thumbor/requirements.txt +++ b/thumbor/requirements.txt @@ -7,7 +7,7 @@ numpy==1.11.0 pyremotecv==0.5.0 remotecv==2.2.1 opencv-engine==1.0.1 -thumbor==6.2.1 +thumbor==6.3.0 tc-aws==6.0.2 tc-core==0.4.0 tc-shortener==0.2.2