Commit of latest dependency build.

Contact abell for gdal packages.
PDAL · Jul 17, 2019 · 26a1e10 · 26a1e10
1 parent 45a497e
commit 26a1e10
Showing 1 changed file with 10 additions and 28 deletions.
diff --git a/scripts/docker/alpine/Dockerfile.dependencies b/scripts/docker/alpine/Dockerfile.dependencies
@@ -1,4 +1,4 @@
-FROM alpine:3.9
+FROM alpine:3.10
 
 #
 # Nitro looks for unistd.h in the wrong place.
@@ -7,30 +7,10 @@ RUN \
     mkdir -p /usr/include/linux; \
     ln -sf /usr/include/unistd.h /usr/include/linux/unistd.h
 
-#
-# To be found at runtime by GDAL, libproj needs to be named plainly.
-#
-RUN \
-    ln -sf /usr/lib/libproj.so.13 /usr/lib/libproj.so
-
-#
-# Datum files for proj
-#
-RUN \
-    mkdir -p /usr/share/proj; \
-    mkdir /vdatum; \
-    cd /vdatum; \
-    wget http://download.osgeo.org/proj/vdatum/usa_geoid2012.zip && unzip -j -o usa_geoid2012.zip -d /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/usa_geoid2009.zip && unzip -j -o usa_geoid2009.zip -d /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/usa_geoid2003.zip && unzip -j -o usa_geoid2003.zip -d /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/usa_geoid1999.zip && unzip -j -o usa_geoid1999.zip -d /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/vertcon/vertconc.gtx && mv vertconc.gtx /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/vertcon/vertcone.gtx && mv vertcone.gtx /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/vertcon/vertconw.gtx && mv vertconw.gtx /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx && mv egm96_15.gtx /usr/share/proj; \
-    wget http://download.osgeo.org/proj/vdatum/egm08_25/egm08_25.gtx && mv egm08_25.gtx /usr/share/proj; \
-    cd /; \
-    rm -rf /vdatum
+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; \
@@ -56,17 +36,19 @@ RUN \
         libcrypto1.1@edgemain \
         xerces-c@edgetesting \
         libspatialite-dev@edgetesting \
-        gdal-dev@edgetesting \
         libgeotiff-dev@edgetesting \
         nitro@edgetesting \
         nitro-dev@edgetesting \
         laszip-dev@edgetesting \
         laz-perf-dev@edgetesting \
         hdf5-dev@edgetesting \
-        proj4@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
 #