Move grid shift files to dependencies.

PDAL · Mar 6, 2020 · cee36ba · cee36ba
1 parent a7fd36c
commit cee36ba
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/scripts/docker/ubuntu/Dockerfile b/scripts/docker/ubuntu/Dockerfile
@@ -42,14 +42,24 @@ RUN . /opt/conda/etc/profile.d/conda.sh && \
     cd pdal/build  && \
     ninja install
 
-RUN apt-get -y remove bzip2 gcc-6 g++-6 ca-certificates && \
+RUN apt-get -y remove unzip bzip2 gcc-6 g++-6 ca-certificates && \
    apt-get -y autoremove 
 
 RUN . /opt/conda/etc/profile.d/conda.sh && \
     conda activate pdal && \
     conda remove -c conda-forge git cmake ninja conda-forge-ci-setup
 
-RUN rm /opt/conda/envs/pdal/lib/*.a
+RUN rm /opt/conda/envs/pdal/lib/*.a && \
+    rm /opt/conda/envs/pdal/include/H5*.h && \
+    rm /opt/conda/envs/pdal/include/h5*.mod && \
+    rm /opt/conda/envs/pdal/include/tcl*.h && \
+    rm /opt/conda/envs/pdal/include/itcl*.h && \
+    rm /opt/conda/envs/pdal/include/tk*.h && \
+    rm -rf /opt/conda/envs/pdal/include/spatialite && \
+    rm -rf /opt/conda/envs/pdal/include/freetype2 && \
+    rm -rf /opt/conda/envs/pdal/include/informix && \
+    rm -rf /opt/conda/envs/pdal/include/fontconfig && \
+    rm -rf /opt/conda/envs/pdal/include/X11
 
 FROM ubuntu:bionic
 

diff --git a/scripts/docker/ubuntu/Dockerfile.dependencies b/scripts/docker/ubuntu/Dockerfile.dependencies
@@ -7,7 +7,7 @@ ENV CXX g++-6
 
 RUN apt-get update --fix-missing && \
     apt-get install -y \
-        wget bzip2 gcc-6 g++-6 ca-certificates curl && \
+        wget unzip bzip2 gcc-6 g++-6 ca-certificates curl && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
@@ -63,3 +63,12 @@ RUN . /opt/conda/etc/profile.d/conda.sh && \
     cd / && \
     rm -rf cpd
 
+RUN \
+    mkdir gridzip && \
+    cd gridzip && \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-1.8.zip &&  unzip -j -u -o proj-datumgrid-1.8.zip  -d /usr/share/proj && rm proj-datumgrid-1.8.zip ; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip &&  unzip -j -u -o proj-datumgrid-europe-1.2.zip -d /usr/share/proj && rm proj-datumgrid-europe-1.2.zip ; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip &&  unzip -j -u -o proj-datumgrid-oceania-1.0.zip -d /usr/share/proj && rm proj-datumgrid-oceania-1.0.zip; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip &&  unzip -j -u -o proj-datumgrid-world-1.0.zip -d /usr/share/proj && rm proj-datumgrid-world-1.0.zip; \
+    curl -LOs http://download.osgeo.org/proj/proj-datumgrid-north-america-1.2.zip &&  unzip -j -u -o proj-datumgrid-north-america-1.2.zip -d /usr/share/proj && rm proj-datumgrid-north-america-1.2.zip
+