migrate batch of projects to ubuntu 24 (#14480)

DavidKorczynski · web-flow · commit 8539a4bf8326 · 2025-12-13T12:13:47.000Z
Signed-off-by: David Korczynski &lt;david@adalogics.com&gt;
diff --git a/projects/apache-cxf/Dockerfile b/projects/apache-cxf/Dockerfile
@@ -37,4 +37,4 @@ RUN apt update && apt install -y openjdk-17-jdk
 RUN git clone --depth 1 https://github.com/apache/cxf/ $SRC/project-parent/cxf
 
 COPY build.sh $SRC/
-WORKDIR $SRC/
+WORKDIR $SRC/
diff --git a/projects/args4j/Dockerfile b/projects/args4j/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/kohsuke/args4j $SRC/args4j
 
diff --git a/projects/args4j/project.yaml b/projects/args4j/project.yaml
@@ -6,4 +6,5 @@ main_repo: "https://github.com/kohsuke/args4j"
 sanitizers:
   - address
 vendor_ccs:
-  - "bug-disclosure@code-intelligence.com"
+  - "bug-disclosure@code-intelligence.com"
+base_os_version: ubuntu-24-04
diff --git a/projects/botocore/Dockerfile b/projects/botocore/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone --depth=1 https://github.com/boto/botocore botocore
 COPY *.sh *py $SRC/
 WORKDIR $SRC/botocore
diff --git a/projects/botocore/project.yaml b/projects/botocore/project.yaml
@@ -8,3 +8,5 @@ sanitizers:
 - undefined
 vendor_ccs:
 - david@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/brotli/Dockerfile b/projects/brotli/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y cmake libtool make
 
 RUN git clone --depth 1 https://github.com/google/brotli.git
diff --git a/projects/brotli/project.yaml b/projects/brotli/project.yaml
@@ -13,3 +13,5 @@ architectures:
   - i386
 main_repo: 'https://github.com/google/brotli.git'
 file_github_issue: True
+
+base_os_version: ubuntu-24-04
diff --git a/projects/bzip2/Dockerfile b/projects/bzip2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone git://sourceware.org/git/bzip2.git
 RUN git clone git://sourceware.org/git/bzip2-tests.git
 COPY build.sh *.c $SRC/
diff --git a/projects/bzip2/project.yaml b/projects/bzip2/project.yaml
@@ -16,3 +16,5 @@ sanitizers:
 architectures:
   - x86_64
   - i386
+main_repo: "https://github.com/libarchive/bzip2"
+base_os_version: ubuntu-24-04
diff --git a/projects/caddy/Dockerfile b/projects/caddy/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 
 RUN git clone --depth 1  https://github.com/caddyserver/caddy caddy
 
diff --git a/projects/caddy/project.yaml b/projects/caddy/project.yaml
@@ -7,4 +7,5 @@ fuzzing_engines:
   - libfuzzer
 sanitizers:
   - address
-main_repo: "https://github.com/caddyserver/caddy.git"
+main_repo: "https://github.com/caddyserver/caddy.git"
+base_os_version: ubuntu-24-04
diff --git a/projects/coveragepy/Dockerfile b/projects/coveragepy/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/nedbat/coveragepy
 WORKDIR coveragepy
diff --git a/projects/coveragepy/project.yaml b/projects/coveragepy/project.yaml
@@ -12,3 +12,5 @@ vendor_ccs:
 - adam@adalogics.com
 # Bug reports are public by default:
 view_restrictions: none
+
+base_os_version: ubuntu-24-04
diff --git a/projects/cups-filters/Dockerfile b/projects/cups-filters/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool build-essential 
 
 ### for cups-filters-2.x
@@ -32,4 +32,4 @@ RUN git clone --depth 1 https://github.com/OpenPrinting/fuzzing.git
         
 RUN cp $SRC/fuzzing/projects/cups-filters/oss_fuzz_build.sh $SRC/build.sh
 
-WORKDIR $SRC/cups-filters                   
+WORKDIR $SRC/cups-filters                   
diff --git a/projects/cups-filters/project.yaml b/projects/cups-filters/project.yaml
@@ -28,4 +28,5 @@ fuzzing_engines:
   # - afl
   # - honggfuzz
 
-# builds_per_day: 2
+# builds_per_day: 2
+base_os_version: ubuntu-24-04
diff --git a/projects/dng_sdk/Dockerfile b/projects/dng_sdk/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y wget cmake libjpeg-turbo8-dev zlib1g-dev libxmp-dev
 RUN git clone https://android.googlesource.com/platform/external/dng_sdk/
 
diff --git a/projects/dng_sdk/project.yaml b/projects/dng_sdk/project.yaml
@@ -10,3 +10,5 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
+
+base_os_version: ubuntu-24-04
diff --git a/projects/dom4j/Dockerfile b/projects/dom4j/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm
+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
 
 # Ensure Java 11 is installed
 RUN apt-get update && \
diff --git a/projects/dom4j/project.yaml b/projects/dom4j/project.yaml
@@ -11,4 +11,5 @@ vendor_ccs:
   - "glendowne@code-intelligence.com"
   - "patrice.salathe@code-intelligence.com"
   - "hlin@code-intelligence.com"
-  - "bug-disclosure@code-intelligence.com"
+  - "bug-disclosure@code-intelligence.com"
+base_os_version: ubuntu-24-04
diff --git a/projects/fabric/Dockerfile b/projects/fabric/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/hyperledger/fabric
 RUN git clone --depth 1 https://github.com/hyperledger/fabric-lib-go
 COPY build.sh ccprovider_fuzzer.go \
diff --git a/projects/fabric/project.yaml b/projects/fabric/project.yaml
@@ -11,3 +11,5 @@ fuzzing_engines:
   - libfuzzer
 sanitizers:
   - address
+
+base_os_version: ubuntu-24-04
diff --git a/projects/fuzzing-puzzles/Dockerfile b/projects/fuzzing-puzzles/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 ADD https://raw.githubusercontent.com/llvm-mirror/compiler-rt/master/test/fuzzer/MultipleConstraintsOnSmallInputTest.cpp \
     $SRC/fuzzing-puzzles/
diff --git a/projects/fuzzing-puzzles/project.yaml b/projects/fuzzing-puzzles/project.yaml
@@ -13,3 +13,5 @@ fuzzing_engines:
   - honggfuzz
 
 disabled: True
+
+base_os_version: ubuntu-24-04
diff --git a/projects/g-api-secret-manager/Dockerfile b/projects/g-api-secret-manager/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN pip3 install --upgrade pip && pip install google-api-core google-cloud-core mock
 RUN git clone --depth 1 https://github.com/googleapis/google-cloud-python
diff --git a/projects/g-api-secret-manager/project.yaml b/projects/g-api-secret-manager/project.yaml
@@ -10,3 +10,5 @@ vendor_ccs:
 - david@adalogics.com
 - adam@adalogics.com
 - arthur.chan@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/gcp-python-cloud-storage/Dockerfile b/projects/gcp-python-cloud-storage/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN pip3 install --upgrade pip && pip3 install mock
 RUN git clone https://github.com/googleapis/python-storage
 COPY build.sh fuzz_fileio.py $SRC/
diff --git a/projects/gcp-python-cloud-storage/project.yaml b/projects/gcp-python-cloud-storage/project.yaml
@@ -11,3 +11,5 @@ vendor_ccs:
 - david@adalogics.com
 - adam@adalogics.com
 - arthur.chan@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/go-containerregistry/Dockerfile b/projects/go-containerregistry/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth 1 https://github.com/google/go-containerregistry
 WORKDIR $SRC/go-containerregistry
 COPY build.sh fuzz.go $SRC/
diff --git a/projects/go-containerregistry/project.yaml b/projects/go-containerregistry/project.yaml
@@ -11,3 +11,5 @@ fuzzing_engines:
   - libfuzzer
 sanitizers:
   - address
+
+base_os_version: ubuntu-24-04
diff --git a/projects/grpc-go/Dockerfile b/projects/grpc-go/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone https://github.com/grpc/grpc-go
 
 RUN git clone --depth 1 https://github.com/grpc/grpc-go $GOPATH/src/google.golang.org/grpc
diff --git a/projects/grpc-go/project.yaml b/projects/grpc-go/project.yaml
@@ -9,3 +9,5 @@ fuzzing_engines:
 sanitizers:
   - address
 main_repo: 'https://github.com/grpc/grpc-go'
+
+base_os_version: ubuntu-24-04
diff --git a/projects/ibmswtpm2/Dockerfile b/projects/ibmswtpm2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 ARG SIM_DL_URL=https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1332.tar.gz
 RUN apt-get update && apt-get install -y make autoconf automake libtool libssl-dev curl tar g++
 RUN mkdir ibmswtpm2 && \
diff --git a/projects/ibmswtpm2/project.yaml b/projects/ibmswtpm2/project.yaml
@@ -17,3 +17,5 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
+
+base_os_version: ubuntu-24-04
diff --git a/projects/json/Dockerfile b/projects/json/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN apt-get update && apt-get install -y binutils make
 
 RUN git clone --depth 1 -b develop https://github.com/nlohmann/json.git
diff --git a/projects/json/project.yaml b/projects/json/project.yaml
@@ -14,3 +14,5 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
+
+base_os_version: ubuntu-24-04
diff --git a/projects/libssh2/Dockerfile b/projects/libssh2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 
 RUN git clone --depth 1 https://github.com/libssh2/libssh2.git /src/libssh2
 
diff --git a/projects/libssh2/project.yaml b/projects/libssh2/project.yaml
@@ -7,3 +7,5 @@ sanitizers:
   - address
   - undefined
 main_repo: 'https://github.com/libssh2/libssh2.git'
+
+base_os_version: ubuntu-24-04
diff --git a/projects/mrab-regex/Dockerfile b/projects/mrab-regex/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/mrabarnett/mrab-regex mrab-regex
 COPY *.sh *py $SRC/
 WORKDIR $SRC/mrab-regex
diff --git a/projects/mrab-regex/project.yaml b/projects/mrab-regex/project.yaml
@@ -8,3 +8,5 @@ sanitizers:
 - undefined
 vendor_ccs:
 - david@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/opencensus-go/Dockerfile b/projects/opencensus-go/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 RUN git clone --depth=1 https://github.com/census-instrumentation/opencensus-go
 COPY build.sh fuzz_test.go $SRC/
 WORKDIR $SRC/opencensus-go
diff --git a/projects/opencensus-go/project.yaml b/projects/opencensus-go/project.yaml
@@ -10,3 +10,5 @@ sanitizers:
 
 # opencensus is being archived cf https://opentelemetry.io/blog/2023/sunsetting-opencensus/
 disabled: true
+
+base_os_version: ubuntu-24-04
diff --git a/projects/paramiko/Dockerfile b/projects/paramiko/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN pip3 install --upgrade pip
 RUN git clone --depth 1 https://github.com/paramiko/paramiko
diff --git a/projects/paramiko/project.yaml b/projects/paramiko/project.yaml
@@ -9,3 +9,5 @@ sanitizers:
 vendor_ccs:
 - david@adalogics.com
 - adam@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/prometheus/Dockerfile b/projects/prometheus/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go
+FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
 ENV GO111MODULE=on
 RUN git clone https://github.com/prometheus/prometheus $GOPATH/src/github.com/prometheus/prometheus
 RUN wget https://go.dev/dl/go1.24.6.linux-amd64.tar.gz \
diff --git a/projects/prometheus/project.yaml b/projects/prometheus/project.yaml
@@ -12,3 +12,5 @@ fuzzing_engines:
 sanitizers:
   - address
 main_repo: 'https://github.com/prometheus/prometheus'
+
+base_os_version: ubuntu-24-04
diff --git a/projects/proto-plus-python/Dockerfile b/projects/proto-plus-python/Dockerfile
@@ -12,7 +12,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN git clone https://github.com/googleapis/proto-plus-python proto-plus-python
 COPY *.sh *py $SRC/
 WORKDIR $SRC/proto-plus-python
diff --git a/projects/proto-plus-python/project.yaml b/projects/proto-plus-python/project.yaml
@@ -8,3 +8,5 @@ sanitizers:
 - undefined
 vendor_ccs:
 - david@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/pugixml/Dockerfile b/projects/pugixml/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder
+FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
 RUN git clone --depth=1 https://github.com/zeux/pugixml
 
 WORKDIR $SRC
diff --git a/projects/pugixml/project.yaml b/projects/pugixml/project.yaml
@@ -10,3 +10,5 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
+
+base_os_version: ubuntu-24-04
diff --git a/projects/python-tabulate/Dockerfile b/projects/python-tabulate/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-python
+FROM gcr.io/oss-fuzz-base/base-builder-python:ubuntu-24-04
 RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/astanin/python-tabulate
 WORKDIR python-tabulate
diff --git a/projects/python-tabulate/project.yaml b/projects/python-tabulate/project.yaml
@@ -10,3 +10,5 @@ primary_contact: "s.astanin@gmail.com"
 vendor_ccs:
 - david@adalogics.com
 - adam@adalogics.com
+
+base_os_version: ubuntu-24-04
diff --git a/projects/s2geometry/Dockerfile b/projects/s2geometry/Dockerfile
diff --git a/projects/s2geometry/project.yaml b/projects/s2geometry/project.yaml
diff --git a/projects/sigstore-python/Dockerfile b/projects/sigstore-python/Dockerfile
diff --git a/projects/sigstore-python/project.yaml b/projects/sigstore-python/project.yaml
diff --git a/projects/sigstore/Dockerfile b/projects/sigstore/Dockerfile
diff --git a/projects/sigstore/project.yaml b/projects/sigstore/project.yaml
diff --git a/projects/teleport/Dockerfile b/projects/teleport/Dockerfile
diff --git a/projects/teleport/project.yaml b/projects/teleport/project.yaml
diff --git a/projects/turf/Dockerfile b/projects/turf/Dockerfile
diff --git a/projects/turf/project.yaml b/projects/turf/project.yaml
diff --git a/projects/twitter4j/Dockerfile b/projects/twitter4j/Dockerfile
diff --git a/projects/twitter4j/project.yaml b/projects/twitter4j/project.yaml
diff --git a/projects/underscore/Dockerfile b/projects/underscore/Dockerfile
diff --git a/projects/underscore/project.yaml b/projects/underscore/project.yaml
diff --git a/projects/xerces-c/Dockerfile b/projects/xerces-c/Dockerfile
diff --git a/projects/xerces-c/project.yaml b/projects/xerces-c/project.yaml
diff --git a/projects/xnnpack/Dockerfile b/projects/xnnpack/Dockerfile
diff --git a/projects/xnnpack/project.yaml b/projects/xnnpack/project.yaml
diff --git a/projects/yara/Dockerfile b/projects/yara/Dockerfile
diff --git a/projects/yara/project.yaml b/projects/yara/project.yaml
diff --git a/projects/yoga/Dockerfile b/projects/yoga/Dockerfile
diff --git a/projects/yoga/project.yaml b/projects/yoga/project.yaml
diff --git a/projects/zlib-ng/Dockerfile b/projects/zlib-ng/Dockerfile
diff --git a/projects/zlib-ng/project.yaml b/projects/zlib-ng/project.yaml

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#`
`15`	`15`	`################################################################################`
`16`	`16`
`17`		`-FROM gcr.io/oss-fuzz-base/base-builder-jvm`
	`17`	`+FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04`
`18`	`18`
`19`	`19`	`RUN git clone --depth 1 https://github.com/kohsuke/args4j $SRC/args4j`
`20`	`20`