diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-02-09 17:59:16 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-02-09 17:59:16 +0100 |
| commit | 83d02d0d17c8b033cc9ef15ec7c354fa94ae8e87 (patch) | |
| tree | b54af5b2e88fb188b055384ca56a3397374adf73 | |
| parent | 98f38e4b5792ce918e978214d8bb43e181cf5c06 (diff) | |
| download | PROJ-83d02d0d17c8b033cc9ef15ec7c354fa94ae8e87.tar.gz PROJ-83d02d0d17c8b033cc9ef15ec7c354fa94ae8e87.zip | |
Dockerfile: make it non-git dependent, so that it can work in branches, and Docker Hub builds; update version of grid archives
| -rw-r--r-- | .dockerignore | 2 | ||||
| -rw-r--r-- | Dockerfile | 16 |
2 files changed, 10 insertions, 8 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..04c6da65 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +.git +build @@ -5,21 +5,21 @@ FROM ubuntu:18.04 as builder MAINTAINER Howard Butler <howard@hobu.co> -ARG PROJ_VERSION=master ARG DESTDIR="/build" # Setup build env RUN apt-get update -y \ && apt-get install -y --fix-missing --no-install-recommends \ software-properties-common build-essential ca-certificates \ - git make cmake wget unzip libtool automake \ + make cmake wget unzip libtool automake \ zlib1g-dev libsqlite3-dev pkg-config sqlite3 -RUN git clone https://github.com/OSGeo/PROJ.git \ - && cd PROJ \ +COPY . /PROJ + +RUN cd /PROJ \ && ./autogen.sh \ && ./configure --prefix=/usr \ - && make \ + && make -j$(nproc) \ && make install @@ -38,10 +38,10 @@ RUN apt-get update; \ RUN \ mkdir -p /usr/share/proj; \ curl -LOs https://download.osgeo.org/proj/proj-datumgrid-1.8.zip && unzip -j -u -o proj-datumgrid-1.8.zip -d /usr/share/proj; \ - curl -LOs https://download.osgeo.org/proj/proj-datumgrid-europe-1.2.zip && unzip -j -u -o proj-datumgrid-europe-1.2.zip -d /usr/share/proj; \ - curl -LOs https://download.osgeo.org/proj/proj-datumgrid-oceania-1.0.zip && unzip -j -u -o proj-datumgrid-oceania-1.0.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-europe-1.5.zip && unzip -j -u -o proj-datumgrid-europe-1.5.zip -d /usr/share/proj; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-oceania-1.1.zip && unzip -j -u -o proj-datumgrid-oceania-1.1.zip -d /usr/share/proj; \ curl -LOs https://download.osgeo.org/proj/proj-datumgrid-world-1.0.zip && unzip -j -u -o proj-datumgrid-world-1.0.zip -d /usr/share/proj; \ - curl -LOs https://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; \ + curl -LOs https://download.osgeo.org/proj/proj-datumgrid-north-america-1.3.zip && unzip -j -u -o proj-datumgrid-north-america-1.3.zip -d /usr/share/proj; \ rm *.zip COPY --from=builder /build/usr/share/proj/ /usr/share/proj/ |