From e3a9fa540cebf3ccdf0675f3f82c196c05119db4 Mon Sep 17 00:00:00 2001
From: monodo <olivier.monod@yverdon-les-bains.ch>
Date: Wed, 17 Apr 2024 15:43:04 +0200
Subject: [PATCH] change base image, user gdal from gchr

---
 Dockerfile           | 29 ++++++++++++++++++++++++++++-
 docker-compose.yml   |  4 ++--
 requirements.in      |  2 +-
 requirements.txt     |  2 +-
 requirements_dev.txt |  2 +-
 5 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ce6a3a9b4..77c6b63d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,31 @@
-FROM sitdocker/geocity-base:v2.1.5
+FROM ghcr.io/osgeo/gdal:ubuntu-small-3.8.3
+
+RUN apt-get -y update \
+  && DEBIAN_FRONTEND=noninteractive apt-get install -y --fix-missing \
+  --no-install-recommends \
+  build-essential \
+  gettext \
+  python3-pip \
+  libcairo2-dev \
+  poppler-utils \
+  python3-dev \
+  python3-setuptools \
+  python3-wheel \
+  python3-cffi \
+  libcairo2 \
+  libpango-1.0-0 \
+  libpangocairo-1.0-0 \
+  libgdk-pixbuf2.0-0 \
+  libffi-dev \
+  shared-mime-info \
+  tzdata \
+  && ln -fs /usr/share/zoneinfo/Europe/Zurich /etc/localtime \
+  && dpkg-reconfigure -f noninteractive tzdata
+
+# Update C env vars so compiler can find gdal
+ENV CPLUS_INCLUDE_PATH=/usr/include/gdal
+ENV C_INCLUDE_PATH=/usr/include/gdal
+ENV PYTHONUNBUFFERED 1
 
 ARG ENV
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7c0cc4ddd..8bc83762d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,7 @@ volumes:
 
 services:
   web: # Name of this container should not be changed
-    image: gms_web
+    image: geocity
     restart: unless-stopped
     build:
       context: ./
@@ -11,7 +11,7 @@ services:
         ENV: PROD
     depends_on:
       - statics_builder
-    entrypoint: /code/entrypoint.sh
+    # entrypoint: /code/entrypoint.sh
     command: "gunicorn geocity.wsgi -b :9000 --error-logfile gunicorn_log.log --workers=2 --threads=4 --worker-class=gthread"
     volumes:
       - ${PRIVATE_DOCUMENTS_DIR}:/private_documents
diff --git a/requirements.in b/requirements.in
index ece966906..336315837 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,7 +7,7 @@ django-tables2
 django-tables2-column-shifter
 # Base docker image must be update when GDAL is updated
 # https://github.com/yverdon/docker-geocity/
-gdal==3.6.3
+gdal==3.8.3
 gunicorn
 html5lib
 jdcal
diff --git a/requirements.txt b/requirements.txt
index 5ee2e6ba4..b09494973 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -136,7 +136,7 @@ et-xmlfile==1.1.0
     # via openpyxl
 filetype==1.2.0
     # via -r requirements.in
-gdal==3.6.3
+gdal==3.8.3
     # via -r requirements.in
 gunicorn==21.2.0
     # via -r requirements.in
diff --git a/requirements_dev.txt b/requirements_dev.txt
index 361b9a519..56f548017 100644
--- a/requirements_dev.txt
+++ b/requirements_dev.txt
@@ -199,7 +199,7 @@ filetype==1.2.0
     # via -r requirements.txt
 freezegun==1.4.0
     # via -r requirements_dev.in
-gdal==3.6.3
+gdal==3.8.3
     # via -r requirements.txt
 gunicorn==21.2.0
     # via -r requirements.txt