Merge pull request #51 from developmentseed/develop

release 1.1.0rc2

Author: matthewhanson

CHANGELOG.md

@@ -6,7 +6,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-## [v1.1.0rc1] - 2018-03-07
+## [v1.1.0] - 2018-03-12
 
 ### Added
 - Make compatible with Lambda Layers
@@ -52,5 +52,5 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - GDAL_VERSION=2.3.1
 
 [Unreleased]: https://github.com/sat-utils/sat-stac/compare/master...develop
-[v1.1.0rc1]: https://github.com/developmentseed/geolambda/compare/1.0.0...1.1.0rc1
+[v1.1.0]: https://github.com/developmentseed/geolambda/compare/1.0.0...1.1.0
 [v1.0.0]: https://github.com/developmentseed/geolambda/tree/1.0.0

Dockerfile

@@ -1,6 +1,7 @@
 FROM lambci/lambda:build-provided
 
-LABEL maintainer="Matthew Hanson <matt.a.hanson@gmail.com>"
+LABEL maintainer="Development Seed <info@developmentseed.org>"
+LABEL authors="Matthew Hanson  <matt.a.hanson@gmail.com>"
 
 # install system libraries
 RUN \
@@ -12,7 +13,7 @@ RUN \
 
 # versions of packages
 ENV \
-    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 \
@@ -33,7 +34,8 @@ ENV \
     NPROC=4 \
 	PREFIX=/usr/local \
 	GDAL_CONFIG=/usr/local/bin/gdal-config \
-	LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
+	LD_LIBRARY_PATH=/usr/local/lib \
+    GDAL_DATA=/usr/local/share/gdal
 
 # switch to a build directory
 WORKDIR /build
@@ -180,12 +182,14 @@ RUN \
         --with-threads=yes \
 		--with-curl=${PREFIX}/bin/curl-config \
         --without-python \
+        --without-libtool \
         --with-geos=$PREFIX/bin/geos-config \
 		--with-hide-internal-symbols=yes \
-        CFLAGS="-O2 -Os" CXXFLAGS="-O2 -Os"; \
+        CFLAGS="-O2 -Os" CXXFLAGS="-O2 -Os" \
+        LDFLAGS="-Wl,-rpath,'\$\$ORIGIN'"; \
     make -j ${NPROC} install; \
     cd ${BUILD}; rm -rf gdal
-
+# 
 # Copy shell scripts and config files over
 COPY bin/* /usr/local/bin/
 

README.md

@@ -1,7 +1,5 @@
 # GeoLambda: geospatial AWS Lambda Layer
 
-Note: this is a pre-release version (v1.1.0rc1) of GeoLambda
-
 The GeoLambda project provides public Docker images and AWS Lambda Layers containing common geospatial native libraries. GeoLambda contains the libraries PROJ.5, GEOS, GeoTIFF, HDF4/5, SZIP, NetCDF, OpenJPEG, WEBP, ZSTD, and GDAL. For some applications you may wish to minimize the size of the libraries by excluding unused libraries, or you may wish to add other libraries. In this case this repository can be used as a template to create your own Docker image or Lambda Layer following the instructions in this README.
 
 This repository also contains examples and pre-built images for specific runtimes.
@@ -15,7 +13,7 @@ While GeoLambda was initially intended for AWS Lambda they are also useful as ba
 | geolambda | GDAL  |
 | -------- | ----  |
 | 1.0.0    | 2.3.1 |
-| 1.1.0rc1  | 2.4.0 |
+| 1.1.0  | 2.4.0 |
 
 To get the version numbers of all installed packages see the [CHANGELOG](CHANGELOG.md) or the Dockerfile for the specific version.
 
@@ -39,15 +37,15 @@ The GeoLambda image does not have an entrypoint defined, so a command must be pr
 
 ### Lambda Layer
 
-If you just wish to use the publicly avialable 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').
+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.0rc1
+#### v1.1.0rc2
 
 | Region | ARN |
 | ------ | --- |
-| us-east-1 | arn:aws:lambda:us-east-1:552188055668:layer:geolambda-dev:1 |
-| us-west-2 | arn:aws:lambda:us-west-2:552188055668:layer:geolambda-dev:1 |
-| eu-central-1 | arn:aws:lambda:eu-central-1:552188055668:layer:geolambda-dev:1 |
+| 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 |
 
 
 ## Development
@@ -82,8 +80,8 @@ $ docker push developmentseed/geolambda:${VERSION}
 4. Create deployment package using the built-in [packaging script](bin/package.sh)
 
 ```
-$ docker run --rm -v $PWD:/home/geolambda --entrypoint package.sh \
-	-it developmentseed/geolambda:${VERSION}
+$ docker run --rm -v $PWD:/home/geolambda \
+	-it developmentseed/geolambda:${VERSION} package.sh
 ```
 
 This will create a lambda/ directory containing the native libraries and related files, along with a `lambda-deploy.zip` file that can be deployed as a Lambda layer.

VERSION

@@ -1 +1 @@
-1.1.0rc1
+1.1.0rc2

bin/package.sh

@@ -8,25 +8,8 @@ echo Creating deploy package
 # make deployment directory and add lambda handler
 mkdir -p $DEPLOY_DIR/lib
 
-# copy 32-bit libs
-cp $PREFIX/lib/libproj.so.13 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libgdal.so.20 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libdf.so.0 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libsz.so.2 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libhdf5.so.103 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libhdf5_hl.so.100 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libmfhdf.so.0 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libgeos_c.so.1 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libgeos-3.7.1.so $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libnetcdf.so.13 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libopenjp2.so.7 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libwebp.so.7 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libgeotiff.so.2 $DEPLOY_DIR/lib/
-cp $PREFIX/lib/libzstd.so.1 $DEPLOY_DIR/lib/
-
-# copy 64-bit libs
-cp /usr/lib64/libjpeg.so.62 $DEPLOY_DIR/lib/
-#cp /usr/lib64/libpq.so.5 $DEPLOY_DIR/lib/
+# copy libs
+cp -P ${PREFIX}/lib/*.so* $DEPLOY_DIR/lib/
 
 strip $DEPLOY_DIR/lib/* || true
 

python/Dockerfile

@@ -1,7 +1,8 @@
 ARG VERSION=latest
 FROM developmentseed/geolambda:${VERSION}
 
-LABEL maintainer="Matthew Hanson <matt.a.hanson@gmail.com>"
+LABEL maintainer="Development Seed <info@developmentseed.org>"
+LABEL authors="Matthew Hanson  <matt.a.hanson@gmail.com>"
 
 ARG PYVERSION=3.6.1
 

python/README.md

@@ -64,12 +64,12 @@ This image includes the dependencies specified in the default [requirements.txt]
 
 ## Development
 
-To create a new official version of a Python GeoLambda Docker image for publication to Docker Hub follow these steps *after* following the [steps for publishing a new base GeoLambda](../README.md)
+To create a new official version of a Python GeoLambda Docker image for publication to Docker Hub follow these steps *after* following the [steps for publishing a new base GeoLambda](../README.md). These steps are performed automatically in [CircleCI](../.circleci/config.yml)
 
 From this directory:
 
 ```
-$ VERSION=${cat ../VERSION}
+$ VERSION=$(cat ../VERSION)
 $ docker build . --build-arg VERSION=${VERSION} -t developmentseed/geolambda:${VERSION}-python36
 ```
 

python/lambda/lambda_function.py

@@ -1,4 +1,5 @@
 import os
+import subprocess
 import sys
 import logging
 
@@ -19,6 +20,16 @@ def lambda_handler(event, context=None):
     """ Lambda handler """
     logger.debug(event)
 
+    # this try block is for testing and info only,
+    # it prints out info on the the libgdal binary and paths to linked libraries
+    #try:
+    #    output = subprocess.check_output('readelf -d /opt/lib/libgdal.so'.split(' '))
+    #    logger.info(output.decode())
+    #    output = subprocess.check_output('ldd /opt/lib/libgdal.so'.split(' '))
+    #    logger.info(output.decode())
+    #except Exception as e:
+    #    pass
+
     # process event payload and do something like this
     fname = event.get('filename', test_filename)
     fname = fname.replace('s3://', '/vsis3/')