Substantial updates to built libraries, with additional python packages

- move the ENV versions to the docker layer that installs the libraries
  - should provide better docker layer caching
- update proj4 to 6.x
- add libgeotiff 1.5.x
- add sqlite3
  - proj4 uses it
  - it is enabled in gdal build
- add a bunch of python GIS packages
  - pyproj
  - pycrs
  - shapely

Author: Darren Weber

Dockerfile

@@ -1,5 +1,10 @@
 FROM lambci/lambda:build-python3.6
 
+# Build GIS libs for AWS serverless solutions.  
+# See also the source builds for Debian packaging:
+# - https://salsa.debian.org/debian-gis-team
+#   - https://packages.ubuntu.com/source/eoan/gdal
+
 ENV \
   LANG=en_US.UTF-8 \
   LC_ALL=en_US.UTF-8
@@ -12,21 +17,22 @@ RUN yum install -y automake16 libpng-devel nasm
 ARG prefix=/var/task
 ENV PREFIX=${prefix}
 
-# versions of packages
-ENV \
-  PKGCONFIG_VERSION=0.29.2 \
-  PROJ_VERSION=5.2.0 \
-  GEOS_VERSION=3.7.1 \
-  LIBPNG_VERSION=1.6.36 \
-  OPENJPEG_VERSION=2.3.1 \
-  LIBJPEG_TURBO_VERSION=2.0.1 \
-  WEBP_VERSION=1.0.2 \
-  ZSTD_VERSION=1.3.8 \
-  CURL_VERSION=7.59.0 \
-  NGHTTP2_VERSION=1.35.1 \
-  GDAL_VERSION=2.4.2
+ENV CPPFLAGS="-I${PREFIX}/include $CPPFLAGS"
+ENV LDFLAGS="-L${PREFIX}/lib $LDFLAGS"
+
+# pkg-config
+ENV PKGCONFIG_VERSION=0.29.2
+RUN mkdir /tmp/pkg-config \
+   && curl -sfL https://pkg-config.freedesktop.org/releases/pkg-config-${PKGCONFIG_VERSION}.tar.gz | tar zxf - -C /tmp/pkg-config --strip-components=1 \
+   && cd /tmp/pkg-config \
+   && CFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX \
+   && make -j $(nproc) --silent && make install && make clean \
+   && rm -rf /tmp/pkg-config
+
+ENV PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/
 
 # nghttp2
+ENV NGHTTP2_VERSION=1.35.1
 RUN mkdir /tmp/nghttp2 \
   && curl -sfL https://github.com/nghttp2/nghttp2/releases/download/v${NGHTTP2_VERSION}/nghttp2-${NGHTTP2_VERSION}.tar.gz | tar zxf - -C /tmp/nghttp2 --strip-components=1 \
   && cd /tmp/nghttp2 \
@@ -35,55 +41,64 @@ RUN mkdir /tmp/nghttp2 \
   && rm -rf /tmp/nghttp2
 
 # libcurl
+ENV CURL_VERSION=7.59.0
 RUN mkdir /tmp/libcurl \
   && curl -sfL https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz | tar zxf - -C /tmp/libcurl --strip-components=1 \
   && cd /tmp/libcurl \
   && ./configure --disable-manual --disable-cookies --with-nghttp2=$PREFIX --prefix=$PREFIX \
   && make -j $(nproc) --silent && make install && make clean \
   && rm -rf /tmp/libcurl
 
-# pkg-config
-RUN mkdir /tmp/pkg-config \
-   && curl -sfL https://pkg-config.freedesktop.org/releases/pkg-config-$PKGCONFIG_VERSION.tar.gz | tar zxf - -C /tmp/pkg-config --strip-components=1 \
-   && cd /tmp/pkg-config \
-   && CFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX \
-   && make -j $(nproc) --silent && make install && make clean \
-   && rm -rf /tmp/pkg-config
-
-# proj
-RUN mkdir /tmp/proj \
-   && curl -sfL http://download.osgeo.org/proj/proj-$PROJ_VERSION.tar.gz | tar zxf - -C /tmp/proj --strip-components=1 \
-   && cd /tmp/proj \
-   && CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX \
-   && make && make install && make clean \
-   && rm -rf /tmp/proj
+# sqlite3
+ENV SQLITE3_VERSION=3.29.0
+RUN mkdir /tmp/sqlite3 \
+    && curl -sfL https://www.sqlite.org/2019/sqlite-autoconf-3290000.tar.gz | tar zxf - -C /tmp/sqlite3 --strip-components=1 \
+    && cd /tmp/sqlite3 \
+    && ./configure --prefix=$PREFIX \
+    && make -j $(nproc) --silent && make install && make clean \
+    && rm -rf /tmp/sqlite3
 
 # geos
+ENV GEOS_VERSION=3.7.1
 RUN mkdir /tmp/geos \
-  && curl -sfL http://download.osgeo.org/geos/geos-$GEOS_VERSION.tar.bz2 | tar jxf - -C /tmp/geos --strip-components=1 \
+  && curl -sfL http://download.osgeo.org/geos/geos-${GEOS_VERSION}.tar.bz2 | tar jxf - -C /tmp/geos --strip-components=1 \
   && cd /tmp/geos \
   && CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX \
   && make -j $(nproc) --silent && make install && make clean \
   && rm -rf /tmp/geos
 
+# proj
+ENV PROJ_VERSION=6.1.1
+RUN mkdir /tmp/proj \
+   && curl -sfL http://download.osgeo.org/proj/proj-${PROJ_VERSION}.tar.gz | tar zxf - -C /tmp/proj --strip-components=1 \
+   && cd /tmp/proj \
+   && CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX \
+   && make && make install && make clean \
+   && rm -rf /tmp/proj
+
 # png
+ENV LIBPNG_VERSION=1.6.36
 RUN mkdir /tmp/png \
   && curl -sfL http://prdownloads.sourceforge.net/libpng/libpng-$LIBPNG_VERSION.tar.gz | tar zxf - -C /tmp/png --strip-components=1 \
   && cd /tmp/png \
   && CFLAGS="-O2 -Wl,-S" CXXFLAGS="-O2 -Wl,-S" ./configure --prefix=$PREFIX \
   && make -j $(nproc) --silent && make install && make clean \
   && rm -rf /tmp/png
+ENV LIBPNG_CONFIG=${PREFIX}/bin/libpng-config
+RUN ls -l $LIBPNG_CONFIG
 
 # openjpeg
+ENV OPENJPEG_VERSION=2.3.1
 RUN mkdir /tmp/openjpeg \
-  && curl -sfL https://github.com/uclouvain/openjpeg/archive/v$OPENJPEG_VERSION.tar.gz | tar zxf - -C /tmp/openjpeg --strip-components=1 \
+  && curl -sfL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | tar zxf - -C /tmp/openjpeg --strip-components=1 \
   && cd /tmp/openjpeg \
   && mkdir build && cd build \
   && cmake .. -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$PREFIX \
   && make -j $(nproc) install && make clean \
   && rm -rf /tmp/openjpeg
 
 # jpeg_turbo
+ENV LIBJPEG_TURBO_VERSION=2.0.1
 RUN mkdir /tmp/jpeg \
   && curl -sfL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${LIBJPEG_TURBO_VERSION}.tar.gz | tar zxf - -C /tmp/jpeg --strip-components=1 \
   && cd /tmp/jpeg \
@@ -92,6 +107,7 @@ RUN mkdir /tmp/jpeg \
   && rm -rf /tmp/jpeg
 
 # webp
+ENV WEBP_VERSION=1.0.2
 RUN mkdir /tmp/webp \
     && curl -sfL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | tar zxf - -C /tmp/webp --strip-components=1 \
     && cd /tmp/webp \
@@ -100,15 +116,28 @@ RUN mkdir /tmp/webp \
     && rm -rf /tmp/webp
 
 # zstd
+ENV ZSTD_VERSION=1.3.8
 RUN mkdir /tmp/zstd \
   && curl -sfL https://github.com/facebook/zstd/archive/v${ZSTD_VERSION}.tar.gz | tar zxf - -C /tmp/zstd --strip-components=1 \
   && cd /tmp/zstd \
   && make -j $(nproc) PREFIX=$PREFIX ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1 --silent && make install PREFIX=$PREFIX ZSTD_LEGACY_SUPPORT=0 CFLAGS=-O1 && make clean \
   && rm -rf /tmp/zstd
 
-ENV PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig/
+## geotiff
+#ENV GEOTIFF_VERSION=1.5.1
+#RUN mkdir /tmp/geotiff \
+#    && archive="https://github.com/OSGeo/libgeotiff/releases/download/${GEOTIFF_VERSION}/libgeotiff-${GEOTIFF_VERSION}.tar.gz" \
+#    && curl -sfL ${archive} |  tar zxf - -C /tmp/geotiff --strip-components=1 \
+#    && cd /tmp/geotiff \
+#    && ./configure --prefix=${PREFIX} \
+#        --with-proj=${PREFIX} \
+#        --with-jpeg=${PREFIX} \
+#        --with-zip=yes \
+#    && make -j $(nproc) install && make clean \
+#    && rm -rf /tmp/geotiff
 
 # gdal
+ENV GDAL_VERSION=2.4.2
 RUN mkdir /tmp/gdal \
   && curl -sfL https://github.com/OSGeo/gdal/archive/v${GDAL_VERSION}.tar.gz | tar zxf - -C /tmp/gdal --strip-components=2
 
@@ -125,7 +154,9 @@ RUN cd /tmp/gdal \
       --with-webp=$PREFIX \
       --with-zstd=$PREFIX \
       --with-crypto \
+      #--with-geotiff=$PREFIX \
       --with-libtiff=internal \
+      --with-sqlite3 \
       --with-threads \
       --disable-debug \
       --with-hide-internal-symbols=yes \
@@ -164,7 +195,6 @@ RUN cd /tmp/gdal \
       --without-python \
       --without-qhull \
       --without-sde \
-      --without-sqlite3 \
       --without-xerces \
       --without-xml2
 
@@ -186,4 +216,4 @@ ENV PATH=$PREFIX/bin:$PATH
 # - https://github.com/numpy/numpy/pull/12783/files
 ENV CFLAGS='-std=c99'
 RUN pip3 install pip -U && \
-    pip3 install cython numpy "gdal==${GDAL_VERSION}" rasterio --no-binary :all:
+    pip3 install cython numpy "gdal==${GDAL_VERSION}" pycrs pyproj rasterio shapely --no-binary :all: