Thumbor 6.5.2

.gitignore

@@ -0,0 +1 @@
+deployment/dist

Dockerfile

@@ -0,0 +1,46 @@
+FROM amazonlinux:2017.03.1.20170812
+
+# lock yum to the same repository version
+RUN sed -i 's/releasever=.*/releasever=2017.03/g' /etc/yum.conf
+
+# base requirements
+RUN yum install yum-utils zip -y && \
+    yum-config-manager --enable epel && \
+    yum install wget git libpng-devel libcurl-devel gcc python27-devel libjpeg-devel -y
+
+# enable epel on Amazon Linux 2
+RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+
+# ImageMagick
+RUN yum install -y ImageMagick-devel
+
+# Other libraries
+RUN yum install -y pngcrush libjpeg* gifsicle
+
+# optipng
+RUN wget http://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/o/optipng-0.7.6-6.el6.x86_64.rpm && \
+    yum localinstall optipng-0.7.6-6.el6.x86_64.rpm -y && rm optipng*rpm
+
+# pngquant
+RUN wget http://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/l/libimagequant-2.5.2-5.el6.x86_64.rpm && \
+    yum localinstall libimagequant-2.5.2-5.el6.x86_64.rpm -y && rm libimagequant*rpm && \
+    wget http://dl.fedoraproject.org/pub/epel/6/x86_64/Packages/p/pngquant-2.5.2-5.el6.x86_64.rpm && \
+    yum localinstall pngquant-2.5.2-5.el6.x86_64.rpm -y && rm pngquant*rpm
+
+# pip
+RUN alias sudo='env PATH=$PATH' && \
+    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py && \
+    python get-pip.py && rm get-pip.py && \
+    pip install --upgrade setuptools && \
+    pip install --upgrade virtualenv
+
+# pycurl
+RUN yum install -y nss-devel
+ENV PYCURL_SSL_LIBRARY=nss
+
+RUN mkdir /lambda
+VOLUME /lambda
+WORKDIR /lambda/deployment
+
+ENTRYPOINT ["./build-s3-dist.sh"]
+CMD ["source-bucket-base-name"]

README.md

@@ -2,30 +2,48 @@
 A solution to dynamically handle images on the fly, utilizing Thumbor (thumbor.org).
 Published version, additional details and documentation are available here: https://aws.amazon.com/answers/web-applications/serverless-image-handler/
 
-## OS/Python Environment Setup
+## Docker Environment Setup
+In order to build the package locally, you'll need to build the docker image. In order to do so, run the following command:
+
 ```bash
-sudo yum-config-manager --enable epel
-sudo yum update -y
-sudo yum install git libpng-devel libcurl-devel gcc python-devel libjpeg-devel -y
-sudo pip install --upgrade pip
-alias sudo='sudo env PATH=$PATH'
-sudo  pip install --upgrade setuptools
-sudo pip install --upgrade virtualenv
+docker build -t serverless-image-handler .
 ```
 
+This will build a docker image that has the following properties:
+
+* pinned to the `amazonlinux` version that [Lambda runs on](https://docs.aws.amazon.com/lambda/latest/dg/current-supported-versions.html)
+* pinned yum repository to `releasever=2017.03`
+  * this is important when building `pycurl` so that the compiled version of libcurl does not differ from the runtime version on the Lambda AMI
+* has all of the base requirements installed
+  * libpng
+  * libjpeg
+  * pngcrush
+  * gifsicle
+  * optipng
+  * pngquant
+
 ## Building Lambda Package
+To build the Lambda package, use the `serverless-image-handler` image that was built earlier. The following command will build the deployment packages:
+
 ```bash
-cd deployment
-./build-s3-dist.sh source-bucket-base-name
+docker run -it --rm --volume $PWD:/lambda serverless-image-handler source-bucket-base-name
 ```
-source-bucket-base-name should be the base name for the S3 bucket location where the template will source the Lambda code from.
+
+`source-bucket-base-name` should be the base name for the S3 bucket location where the template will source the Lambda code from.
 The template will append '-[region_name]' to this value.
 For example: ./build-s3-dist.sh solutions
 The template will then expect the source code to be located in the solutions-[region_name] bucket
 
 ## CF template and Lambda function
 Located in deployment/dist
 
+```
+deployment/dist/
+├── [2.0M]  serverless-image-handler-custom-resource.zip
+├── [6.4M]  serverless-image-handler-ui.zip
+├── [ 23K]  serverless-image-handler.template
+└── [ 48M]  serverless-image-handler.zip
+```
 
 ***
 

source/image-handler-custom-resource/setup.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 from setuptools import setup, find_packages
-from pip.req import parse_requirements
+from pip._internal.req import parse_requirements
 
 setup(
     name='image_handler_custom_resource',

source/image-handler/lambda_function.py

@@ -213,7 +213,7 @@ def request_thumbor(original_request, session):
 
 def process_thumbor_responde(thumbor_response, vary):
      if thumbor_response.status_code != 200:
-         return response_formater(status_code=response.status_code)
+         return response_formater(status_code=thumbor_response.status_code)
      if vary:
          vary = thumbor_response.headers['vary']
      content_type = thumbor_response.headers['content-type']

source/image-handler/setup.py

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 from setuptools import setup, find_packages
-from pip.req import parse_requirements
+from pip._internal.req import parse_requirements
 
 tests_require = [
     'mock',
@@ -23,11 +23,11 @@
             '': ['*.conf'],
     },
     install_requires=[
-        'botocore==1.3.7',
-        'tornado_botocore==1.0.2',
+        'botocore==1.8',
+        'tornado_botocore==1.3.2',
         'requests_unixsocket>=0.1.5',
-        'thumbor>=6.4.2',
-        'tc_aws==6.0.3',
+        'thumbor>=6.5.2',
+        'tc_aws==6.2.10',
         'opencv-python==3.2.0.6'
     ],
     extras_require={