From b3917e46888a6348cc6c3a64753d8082e8489334 Mon Sep 17 00:00:00 2001 From: Ahmed Nour Eldeen Date: Mon, 26 Apr 2021 11:27:08 +0200 Subject: [PATCH] [Fixes #7362] GDAL upgrade to issue wtih postgres 12 and higher (#7363) * GDAL upgrade to issue wtih postgres 12 and higher https://github.com/OSGeo/gdal/issues/1692 * add bullseye to source list to get GDAL 3.2.1 instead of compiling it. (cherry picked from commit 5f45545ea6c9e498b155d14281d6be1de7fb85c4) --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 339514815e5..3a08dc87361 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,6 +8,10 @@ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg main" | tee / RUN echo "deb http://deb.debian.org/debian/ stable main contrib non-free" | tee /etc/apt/sources.list.d/debian.list RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - +# To get GDAL 3.2.1 to fix this issue https://github.com/OSGeo/gdal/issues/1692 +# TODO: The following line should be removed if base image upgraded to Bullseye +RUN echo "deb http://deb.debian.org/debian/ bullseye main contrib non-free" | tee /etc/apt/sources.list.d/debian.list + # This section is borrowed from the official Django image but adds GDAL and others RUN apt-get update && apt-get install -y \ libgdal-dev libpq-dev libxml2-dev \ @@ -24,6 +28,7 @@ RUN apt-get update && apt-get install -y \ firefox-esr \ --no-install-recommends && rm -rf /var/lib/apt/lists/* + # add bower and grunt command COPY . /usr/src/geonode/ WORKDIR /usr/src/geonode @@ -56,7 +61,7 @@ RUN pip install --upgrade --no-cache-dir --src /usr/src -r requirements.txt \ RUN pip install --upgrade -e . # Activate "memcached" -RUN apt install memcached +RUN apt install -y memcached RUN pip install pylibmc \ && pip install sherlock