Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport to 3.2.x][Fixes #7362] GDAL upgrade to issue wtih postgres 12 and higher (#7363) #7389

Merged
merged 1 commit into from
Apr 26, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down Expand Up @@ -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

Expand Down