From da0694854117cc84d1f686d9bd1694348233c2ff Mon Sep 17 00:00:00 2001 From: maflcko <6399679+maflcko@users.noreply.github.com> Date: Wed, 1 May 2024 04:42:39 +0200 Subject: [PATCH] proj4: Use latest builder (#11857) Co-authored-by: MarcoFalke <6399679+MarcoFalke@users.noreply.github.com> --- projects/proj4/Dockerfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/proj4/Dockerfile b/projects/proj4/Dockerfile index 474360e4fbb9..18faf7eb7d28 100644 --- a/projects/proj4/Dockerfile +++ b/projects/proj4/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++ sqlite3 pkg-config wget +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/PROJ PROJ RUN git clone --depth 1 https://github.com/curl/curl.git PROJ/curl