From b3020a94bafefe0b62b2fdbf5e565b5157a86800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Miguel?=
 <36349314+vrmiguel@users.noreply.github.com>
Date: Thu, 19 Dec 2024 17:16:46 -0300
Subject: [PATCH] Undo bump to 24.04, update geo-cnpg

---
 geo-cnpg/Dockerfile      | 10 ++++++++--
 tembo-pg-slim/Dockerfile |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/geo-cnpg/Dockerfile b/geo-cnpg/Dockerfile
index 00d2bf5..271ea12 100644
--- a/geo-cnpg/Dockerfile
+++ b/geo-cnpg/Dockerfile
@@ -15,11 +15,18 @@ RUN apt-get update && \
     libproj-dev \
     libprotobuf-c-dev \
     protobuf-c-compiler \
-    libgdal-dev \
     libgsl-dev \
     libjson-c-dev \
     && rm -rf /var/lib/apt/lists/*
 
+RUN wget https://github.com/OSGeo/gdal/releases/download/v3.6.0/gdal-3.6.0.tar.gz && \
+    tar xvf gdal-3.6.0.tar.gz && \
+    cd gdal-3.6.0 && \
+    mkdir build && cd build && \
+    cmake .. && \
+    cmake --build . && \
+    cmake --build . --target install
+
 # Download and build PostGIS
 RUN wget https://download.osgeo.org/postgis/source/postgis-3.4.0.tar.gz && \
     tar xvf postgis-3.4.0.tar.gz && \
@@ -29,7 +36,6 @@ RUN wget https://download.osgeo.org/postgis/source/postgis-3.4.0.tar.gz && \
     make install
 
 # Clone and build mobilitydb
-
 RUN git clone https://github.com/MobilityDB/MobilityDB && \
     cd MobilityDB && \
     git checkout v1.2.0rc1 && \
diff --git a/tembo-pg-slim/Dockerfile b/tembo-pg-slim/Dockerfile
index 1c6fe27..670dda5 100644
--- a/tembo-pg-slim/Dockerfile
+++ b/tembo-pg-slim/Dockerfile
@@ -1,5 +1,5 @@
 # vim:set ft=dockerfile:
-FROM quay.io/tembo/ubuntu:24.04
+FROM quay.io/coredb/ubuntu:22.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 ARG ALTDIR=/var/lib/postgresql/data/tembo