فهرست منبع

use proj 6.2.1 in Alpine Dockerfile (#255)

- switch to current and official PROJ package as offered by Alpine
mmacata 5 سال پیش
والد
کامیت
70144234a0
1فایلهای تغییر یافته به همراه7 افزوده شده و 27 حذف شده
  1. 7 27
      docker/alpine/Dockerfile_alpine

+ 7 - 27
docker/alpine/Dockerfile_alpine

@@ -7,8 +7,6 @@ LABEL maintainer="peter.zamb@gmail.com,neteler@osgeo.org"
 
 # PACKAGES VERSIONS
 ARG PYTHON_VERSION=3
-ARG PROJ_VERSION=5.2.0
-ARG PROJ_DATUMGRID_VERSION=1.8
 
 # ================
 # CONFIG VARIABLES
@@ -78,6 +76,8 @@ ENV PACKAGES="\
       py3-pillow \
       py3-six \
       postgresql \
+      proj-datumgrid \
+      proj-util \
       sqlite \
       sqlite-libs \
       tiff \
@@ -105,6 +105,7 @@ ENV PACKAGES="\
       openblas-dev \
       pdal-dev \
       postgresql-dev \
+      proj-dev \
       python3-dev \
       py3-numpy-dev \
       sqlite-dev \
@@ -148,26 +149,6 @@ RUN echo "Install main packages";\
             --virtual .build-deps $GRASS_BUILD_PACKAGES; \
     # echo LANG="en_US.UTF-8" > /etc/default/locale;
     #
-    # install the latest (and compatible) projection library for GRASS GIS
-    #
-    echo "Install PROJ-$PROJ_VERSION";\
-    echo "  => Downloading proj-$PROJ_VERSION";\
-    wget -q http://download.osgeo.org/proj/proj-$PROJ_VERSION.tar.gz && \
-    tar xzvf proj-$PROJ_VERSION.tar.gz && \
-    cd /src/proj-$PROJ_VERSION/ && \
-    echo "  => Downloading datumgrid-$PROJ_DATUMGRID_VERSION" &&\
-    wget -q http://download.osgeo.org/proj/proj-datumgrid-$PROJ_DATUMGRID_VERSION.zip && \
-    cd nad && \
-    unzip ../proj-datumgrid-$PROJ_DATUMGRID_VERSION.zip && \
-    cd .. && \
-    echo "  => configure" &&\
-    ./configure --prefix=/usr/ && \
-    echo "  => compile" &&\
-    make && \
-    echo "  => install" &&\
-    make install && \
-    ldconfig /etc/ld.so.conf.d; \
-    #
     # Checkout and install GRASS GIS
     #
     echo "Install GRASS GIS";\
@@ -195,11 +176,10 @@ RUN echo "  => Configure and compile grass";\
     rm -rf /var/cache/apk/*; \
     rm -rf /root/.cache; \
     # Remove unnecessary grass files
-    rm -rf /usr/local/grass79/demolocation; \
-    rm -rf /usr/local/grass79/docs; \
-    rm -rf /usr/local/grass79/fonts; \
-    rm -rf /usr/local/grass79/gui; \
-    rm -rf /usr/local/grass79/share;
+    rm -rf /usr/local/grass78/demolocation; \
+    rm -rf /usr/local/grass78/fonts; \
+    rm -rf /usr/local/grass78/gui; \
+    rm -rf /usr/local/grass78/share;
 
 
 # Unset environmental variables to avoid later compilation issues