Skip to content

Commit 82fce78

Browse files
committed
[GDAL] Update to ubuntu 24.04 image
This will be a 3-phase process: 1. This PR will temporarily point to my fork at https://github.com/rouault/gdal/tree/ossfuzz_ubuntu_2404 that contains the needed GDAL side changes: rouault/gdal@2c2ab24 2. Once this PR is merged, I will merge the above commit into GDAL master 3. And I will issue a new PR here pointing back to GDAL master This way this will not break things
1 parent 2a69730 commit 82fce78

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

projects/gdal/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@
1414
#
1515
################################################################################
1616

17-
FROM gcr.io/oss-fuzz-base/base-builder
17+
FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
18+
1819
RUN apt-get update && \
1920
apt-get install -y make autoconf automake libtool g++ curl cmake sqlite3 pkg-config
2021

21-
RUN git clone --depth 1 https://github.com/OSGeo/gdal gdal
22+
# Using this temporary branch while the pull request in google/ossfuzz has not been yet merged
23+
# Once it has been, this ossfuzz_ubuntu_2404 branch will be merged back to OSGeo/gdal master
24+
RUN git clone --depth 1 --branch ossfuzz_ubuntu_2404 https://github.com/rouault/gdal gdal
25+
#RUN git clone --depth 1 https://github.com/OSGeo/gdal gdal
2226

2327
RUN cp gdal/fuzzers/build.sh $SRC/
2428

projects/gdal/project.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
base_os_version: ubuntu-24-04
12
homepage: "https://gdal.org"
23
language: c++
34
primary_contact: "even.rouault@gmail.com"
@@ -15,9 +16,3 @@ architectures:
1516
- x86_64
1617
- i386
1718
main_repo: 'https://github.com/OSGeo/gdal'
18-
19-
fuzzing_engines:
20-
- afl
21-
- honggfuzz
22-
- libfuzzer
23-

0 commit comments

Comments
 (0)