From a87c90b78c7e2e8ab33e9af9acb614df3aea5391 Mon Sep 17 00:00:00 2001 From: Julius Osokinas Date: Sat, 18 Aug 2018 14:25:14 +0100 Subject: [PATCH 1/2] Use new image that comes with GDAL already --- Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 51d65b27..f88453a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,10 @@ -FROM python:2.7 - -RUN apt-get update && apt-get install -y wget +FROM ecarrara/python-gdal ENV DOCKERIZE_VERSION v0.5.0 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz -RUN apt-get install -y libgdal-dev -RUN pip install --global-option=build_ext --global-option="-I/usr/include/gdal" gdal==1.10 - ADD /geokey/local_settings /app/local_settings ADD /geokey /app # Uncomment for communitymaps. From 3a5226fbec5115c84feb5592d87aea7cdaf43d38 Mon Sep 17 00:00:00 2001 From: Julius Osokinas Date: Sat, 18 Aug 2018 14:25:43 +0100 Subject: [PATCH 2/2] Upgrade Dockerize --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f88453a9..512a4da3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM ecarrara/python-gdal -ENV DOCKERIZE_VERSION v0.5.0 +ENV DOCKERIZE_VERSION v0.6.1 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz