From 6b05655f197d1e36849cfb501730e2391ae358cf Mon Sep 17 00:00:00 2001
From: maflcko <6399679+maflcko@users.noreply.github.com>
Date: Thu, 2 May 2024 21:14:22 +0200
Subject: [PATCH] gdal: Use latest builder (#11871)

Co-authored-by: MarcoFalke <6399679+MarcoFalke@users.noreply.github.com>
---
 projects/gdal/Dockerfile | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/projects/gdal/Dockerfile b/projects/gdal/Dockerfile
index 3d84751fab5d..b3b32e8cd038 100644
--- a/projects/gdal/Dockerfile
+++ b/projects/gdal/Dockerfile
@@ -14,11 +14,16 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder@sha256:19782f7fe8092843368894dbc471ce9b30dd6a2813946071a36e8b05f5b1e27e
-# ! This project was pinned after a clang bump. Please remove the pin, Try to fix any build warnings and errors, as well as runtime errors
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && \
     apt-get install -y make autoconf automake libtool g++ curl cmake sqlite3 pkg-config
 
+ENV CMAKE_VERSION 3.29.2
+RUN apt-get update && apt-get install -y wget sudo && \
+    wget https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.sh && \
+    chmod +x cmake-$CMAKE_VERSION-Linux-x86_64.sh && \
+    ./cmake-$CMAKE_VERSION-Linux-x86_64.sh --skip-license --prefix="/usr/local"
+
 RUN git clone --depth 1 https://github.com/OSGeo/gdal gdal
 
 RUN cp gdal/fuzzers/build.sh $SRC/