Merge pull request #55 from developmentseed/develop

1.1.0rc3

Author: matthewhanson

CHANGELOG.md

@@ -6,13 +6,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [v1.1.0] - 2018-03-12
+## [v1.1.0] - 2018-03-14
 
 ### Added
 - Make compatible with Lambda Layers
 - Python example
 - Improve documentation
-- More libraries (CURL with http2, webp, zstd)
+- More libraries (CURL with http2, webp, zstd, libjpegturbo)
 - GeoTIFF now compiled from scratch rather than GGDAL builtin
 - Published public lambda layers - see README for ARNs
 
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Removed Python codes to make geolambda system libraries only
 
 ### Versions:
-- CURL_VERSION=7.51.0
+- CURL_VERSION=7.59.0
 - GEOS_VERSION=3.7.1
 - GEOTIFF_VERSION=1.4.3
 - GDAL_VERSION=2.4.0
@@ -32,11 +32,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - NETCDF_VERSION=4.6.2
 - NGHTTP2_VERSION=1.35.1
 - OPENJPEG_VERSION=2.3.0
+- LIBJPEG_TURBO_VERSION=2.0.1
 - PKGCONFIG_VERSION=0.29.2
 - PROJ_VERSION=5.2.0
 - SZIP_VERSION=2.1.1
-- WEBP_VERSION=1.0.0
-- ZSTD_VERSION=1.3.4
+- WEBP_VERSION=1.0.1
+- ZSTD_VERSION=1.3.8
 
 ## [v1.0.0] - 2018-07-27
 

Dockerfile

@@ -6,7 +6,7 @@ LABEL authors="Matthew Hanson  <matt.a.hanson@gmail.com>"
 # install system libraries
 RUN \
     yum makecache fast; \
-    yum install -y wget libpng-devel; \
+    yum install -y wget libpng-devel nasm; \
     yum install -y bash-completion --enablerepo=epel; \
     yum clean all; \
     yum autoremove
@@ -22,19 +22,20 @@ ENV \
     NETCDF_VERSION=4.6.2 \
     NGHTTP2_VERSION=1.35.1 \
 	OPENJPEG_VERSION=2.3.0 \
+    LIBJPEG_TURBO_VERSION=2.0.1 \
     PKGCONFIG_VERSION=0.29.2 \
     PROJ_VERSION=5.2.0 \
     SZIP_VERSION=2.1.1 \
-    WEBP_VERSION=1.0.0 \
-    ZSTD_VERSION=1.3.4
+    WEBP_VERSION=1.0.1 \
+    ZSTD_VERSION=1.3.8
 
 # Paths to things
 ENV \
 	BUILD=/build \
     NPROC=4 \
 	PREFIX=/usr/local \
 	GDAL_CONFIG=/usr/local/bin/gdal-config \
-	LD_LIBRARY_PATH=/usr/local/lib \
+	LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 \
     GDAL_DATA=/usr/local/share/gdal
 
 # switch to a build directory
@@ -153,13 +154,22 @@ RUN \
     make -j ${NPROC} install; \
     cd ../..; rm -rf openjpeg
 
+# jpeg_turbo
+RUN \
+    mkdir jpeg; \
+    wget -qO- https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${LIBJPEG_TURBO_VERSION}.tar.gz \
+        | tar xvz -C jpeg --strip-components=1; cd jpeg; \
+    cmake -G"Unix Makefiles" -DCMAKE_INSTALL_PREFIX=$PREFIX .; \
+    make -j $(nproc) install; \
+    cd ..; rm -rf jpeg
+
 # geotiff
 RUN \
     mkdir geotiff; \
     wget -qO- https://download.osgeo.org/geotiff/libgeotiff/libgeotiff-$GEOTIFF_VERSION.tar.gz \
         | tar xvz -C geotiff --strip-components=1; cd geotiff; \
     ./configure --prefix=${PREFIX} \
-        --with-proj=${PREFIX} --with-jpeg=yes --with-zip=yes;\
+        --with-proj=${PREFIX} --with-jpeg=${PREFIX} --with-zip=yes;\
     make -j ${NPROC} install; \
     cd ${BUILD}; rm -rf geotiff
 
@@ -179,6 +189,7 @@ RUN \
         --with-netcdf=${PREFIX} \
         --with-webp=${PREFIX} \
         --with-zstd=${PREFIX} \
+        --with-jpeg=${PREFIX} \
         --with-threads=yes \
 		--with-curl=${PREFIX}/bin/curl-config \
         --without-python \

README.md

@@ -39,13 +39,13 @@ The GeoLambda image does not have an entrypoint defined, so a command must be pr
 
 If you just wish to use the publicly available Lambda layer you will need the ARN for the layer in same region as your Lambda function. Currently, GeoLambda layers are available in `us-east-1`, `us-west-2`, and `eu-central-1`. If you want to use it in another region please file an issue or you can also create your own layer using this repository (see instructions below on 'Create a new version').
 
-#### v1.1.0rc2
+#### v1.1.0rc3
 
 | Region | ARN |
 | ------ | --- |
-| us-east-1 | arn:aws:lambda:us-east-1:552188055668:layer:geolambda-dev:2 |
-| us-west-2 | arn:aws:lambda:us-west-2:552188055668:layer:geolambda-dev:2 |
-| eu-central-1 | arn:aws:lambda:eu-central-1:552188055668:layer:geolambda-dev:2 |
+| us-east-1 | arn:aws:lambda:us-east-1:552188055668:layer:geolambda-dev:3 |
+| us-west-2 | arn:aws:lambda:us-west-2:552188055668:layer:geolambda-dev:3 |
+| eu-central-1 | arn:aws:lambda:eu-central-1:552188055668:layer:geolambda-dev:3 |
 
 
 ## Development

VERSION

@@ -1 +1 @@
-1.1.0rc2
+1.1.0rc3

bin/package.sh

@@ -10,6 +10,7 @@ mkdir -p $DEPLOY_DIR/lib
 
 # copy libs
 cp -P ${PREFIX}/lib/*.so* $DEPLOY_DIR/lib/
+cp -P ${PREFIX}/lib64/libjpeg*.so* $DEPLOY_DIR/lib/
 
 strip $DEPLOY_DIR/lib/* || true
 

python/README.md

@@ -18,7 +18,8 @@ An example Lambda handler is located at [lambda/lambda_function.py](lambda/lambd
 
 Now, use the [Dockerfile](Dockerfile) can be used to create a new Docker image based on any version of GeoLambda with any version of Python by providing the versions as build arguments to `docker run`. This will install the specified version of Python along with any Python packages provided in [requirements.txt](requirements.txt).
 
-    $ docker build . --build-arg VERSION=1.1.0 --build-arg PYVERSION=3.6.1 -t <myimage>:latest
+    $ VERSION=1.1.0
+    $ docker build . --build-arg VERSION=${VERSION} --build-arg PYVERSION=3.6.1 -t <myimage>:latest
 
 If not provided, `VERSION` (the version of GeoLambda to use) will default to `latest` and `PYVERSION` (Python version) will default to `3.6.1`.