From 8c9ed021c7554efa4eec8f852aac85b301ab5c4b Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 9 Feb 2020 17:29:20 +0100 Subject: [PATCH] Dockerfile: make it non-git dependent, so that it can work in branches, and Docker Hub builds --- .dockerignore | 2 ++ Dockerfile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..04c6da65b3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +.git +build diff --git a/Dockerfile b/Dockerfile index 158fc59db2..9a2c44b34c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,19 +5,19 @@ FROM ubuntu:18.04 as builder MAINTAINER Howard Butler -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 libcurl4-gnutls-dev \ libtiff5-dev -RUN git clone --depth 1 --single-branch https://github.com/OSGeo/PROJ.git \ - && cd PROJ \ +COPY . /PROJ + +RUN cd /PROJ \ && ./autogen.sh \ && ./configure --prefix=/usr \ && make -j$(nproc) \