Update Alpine Docker builds to 3.11.

scripts/docker/alpine/Dockerfile → scripts/docker/alpine/Dockerfile.2.0

@@ -1,4 +1,4 @@
-FROM pdal/alpinebase:latest as builder
+FROM abellia/pdalbase:latest as builder
 
 RUN    \
     git clone https://github.com/PDAL/PDAL.git --branch 2.0-maintenance --single-branch pdal; \
@@ -8,14 +8,14 @@ RUN    \
     cmake .. \
         -G Ninja \
         -DCMAKE_BUILD_TYPE=Release \
-        -DBUILD_PLUGIN_PYTHON=ON \
         -DBUILD_PLUGIN_NITF=ON \
         -DBUILD_PLUGIN_GREYHOUND=ON \
         -DBUILD_PLUGIN_CPD=ON \
         -DBUILD_PLUGIN_ICEBRIDGE=ON \
         -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
         -DBUILD_PLUGIN_SQLITE=ON \
         -DBUILD_PLUGIN_I3S=ON \
+        -DBUILD_PLUGIN_E57=ON \
         -DWITH_LASZIP=ON \
         -DWITH_LAZPERF=ON \
         -DWITH_LAZPERF=ON \
@@ -38,7 +38,7 @@ RUN    \
     rm /usr/bin/ogr*; \
     rm /usr/bin/h5*;
 
-FROM alpine:3.10
+FROM alpine:3.11
 
 COPY --from=builder /usr/ /usr/
 COPY --from=builder /lib/ /lib/

scripts/docker/alpine/Dockerfile.dependencies

@@ -1,4 +1,4 @@
-FROM alpine:3.10
+FROM alpine:3.11
 
 #
 # Nitro looks for unistd.h in the wrong place.
@@ -7,14 +7,10 @@ RUN \
     mkdir -p /usr/include/linux; \
     ln -sf /usr/include/unistd.h /usr/include/linux/unistd.h
 
-COPY \
-    gdal-dev-3.0.0-r0.apk gdal-dev-3.0.0-r0.apk
-COPY \
-    gdal-3.0.0-r0.apk gdal-3.0.0-r0.apk
-
 RUN \
-    echo "@edgetesting http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories; \
-    echo "@edgemain http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories; \
+    echo "http://mirror.clarkson.edu/alpine/edge/main" >> /etc/apk/repositories; \
+    echo "http://mirror.clarkson.edu/alpine/edge/community" >> /etc/apk/repositories; \
+    echo "@edgetesting http://mirror.clarkson.edu/alpine/edge/testing" >> /etc/apk/repositories; \
     apk update; \
     apk add --no-cache \
         git \
@@ -26,29 +22,26 @@ RUN \
     apk add --no-cache \
         eigen-dev \
         py3-numpy \
-        py-numpy-dev \
+        py3-numpy-dev \
         libxml2-dev \
         python3-dev \
         curl-dev \
+        gdal-dev \
         postgresql-dev \
         sqlite-dev \
         zstd-dev \
-        libcrypto1.1@edgemain \
-        xerces-c@edgetesting \
+        libcrypto1.1 \
+        xerces-c-dev \
+        proj-dev \
+        proj-datumgrid \
         libspatialite-dev@edgetesting \
         libgeotiff-dev@edgetesting \
         nitro@edgetesting \
         nitro-dev@edgetesting \
         laszip-dev@edgetesting \
         laz-perf-dev@edgetesting \
         hdf5-dev@edgetesting \
-        proj@edgetesting \
-        proj-datumgrid@edgetesting \
-        xerces-c@edgetesting \
     ; \
-    apk add --allow-untrusted \
-        ./gdal-dev-3.0.0-r0.apk \
-        ./gdal-3.0.0-r0.apk;\
 #
 # These use PDAL's vendor/eigen
 #

scripts/docker/alpine/Dockerfile.master

@@ -0,0 +1,45 @@
+FROM abellia/pdalbase:latest as builder
+
+RUN    \
+    git clone https://github.com/PDAL/PDAL.git --branch master --single-branch pdal; \
+    cd pdal; \
+    mkdir build; \
+    cd build; \
+    cmake .. \
+        -G Ninja \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBUILD_PLUGIN_NITF=ON \
+        -DBUILD_PLUGIN_GREYHOUND=ON \
+        -DBUILD_PLUGIN_CPD=ON \
+        -DBUILD_PLUGIN_ICEBRIDGE=ON \
+        -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
+        -DBUILD_PLUGIN_SQLITE=ON \
+        -DBUILD_PLUGIN_I3S=ON \
+        -DBUILD_PLUGIN_E57=ON \
+        -DWITH_LASZIP=ON \
+        -DWITH_LAZPERF=ON \
+        -DWITH_LAZPERF=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr/local \
+        -DCMAKE_INSTALL_LIBDIR=lib \
+        ; \
+    ninja install; \
+    cd /; \
+    rm -rf pdal; \
+    \
+    apk del \
+        git \
+        cmake \
+        ninja \
+        g++ \
+    ; \
+    rm -rf /usr/share/hdf5_examples; \
+    rm /usr/lib/*.a; \
+    rm /usr/bin/gdal*; \
+    rm /usr/bin/ogr*; \
+    rm /usr/bin/h5*;
+
+FROM alpine:3.11
+
+COPY --from=builder /usr/ /usr/
+COPY --from=builder /lib/ /lib/
+