Revert "upgrade batch of projects to ubuntu 24 (#14652)"

DavidKorczynski · web-flow · commit db68bd30ec42 · 2025-12-23T22:31:00.000Z
This reverts commit 36c1082.
diff --git a/projects/jackson-modules-java8/Dockerfile b/projects/jackson-modules-java8/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
@@ -30,4 +30,4 @@ RUN git clone --depth 1 https://github.com/FasterXML/jackson-modules-java8
 
 COPY build.sh $SRC/
 COPY *Fuzzer.java $SRC/
-WORKDIR $SRC/jackson-modules-java8
+WORKDIR $SRC/jackson-modules-java8
diff --git a/projects/jackson-modules-java8/project.yaml b/projects/jackson-modules-java8/project.yaml
@@ -12,5 +12,4 @@ vendor_ccs:
   - "glendowne@code-intelligence.com"
   - "patrice.salathe@code-intelligence.com"
   - "hlin@code-intelligence.com"
-  - "bug-disclosure@code-intelligence.com"
-base_os_version: ubuntu-24-04
+  - "bug-disclosure@code-intelligence.com"
diff --git a/projects/jakarta-mail-api/Dockerfile b/projects/jakarta-mail-api/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
diff --git a/projects/jakarta-mail-api/project.yaml b/projects/jakarta-mail-api/project.yaml
@@ -12,5 +12,4 @@ vendor_ccs:
   - "patrice.salathe@code-intelligence.com"
   - "yakdan@code-intelligence.com"
   - "hlin@code-intelligence.com"
-  - "bug-disclosure@code-intelligence.com"
-base_os_version: ubuntu-24-04
+  - "bug-disclosure@code-intelligence.com"
diff --git a/projects/jdom/Dockerfile b/projects/jdom/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
 RUN curl -L https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.14-bin.tar.gz -o ant.tar.gz && \
     mkdir -p $SRC/ant && \
diff --git a/projects/jdom/project.yaml b/projects/jdom/project.yaml
@@ -15,5 +15,3 @@ vendor_ccs:
   - "jacek.trossen@code-intelligence.com"
   - "michael.nothhard@code-intelligence.com"
   - "bug-disclosure@code-intelligence.com"
-
-base_os_version: ubuntu-24-04
diff --git a/projects/jettison/Dockerfile b/projects/jettison/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
diff --git a/projects/jettison/project.yaml b/projects/jettison/project.yaml
@@ -11,5 +11,4 @@ vendor_ccs:
 - patrice.salathe@code-intelligence.com
 - yakdan@code-intelligence.com
 - hlin@code-intelligence.com
-- bug-disclosure@code-intelligence.com
-base_os_version: ubuntu-24-04
+- bug-disclosure@code-intelligence.com
diff --git a/projects/jose4j/Dockerfile b/projects/jose4j/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
     unzip maven.zip -d $SRC/maven && \
@@ -38,4 +38,4 @@ RUN rm -rf $SRC/project-parent/jose4j
 RUN git clone --depth 1 https://bitbucket.org/b_c/jose4j/src/master/ $SRC/project-parent/jose4j
 
 COPY build.sh $SRC/
-WORKDIR $SRC/
+WORKDIR $SRC/
diff --git a/projects/jose4j/project.yaml b/projects/jose4j/project.yaml
@@ -11,5 +11,4 @@ vendor_ccs:
   - "yakdan@code-intelligence.com"
   - "patrice.salathe@code-intelligence.com"
   - "hlin@code-intelligence.com"
-  - "bug-disclosure@code-intelligence.com"
-base_os_version: ubuntu-24-04
+  - "bug-disclosure@code-intelligence.com"
diff --git a/projects/jsoncons/Dockerfile b/projects/jsoncons/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make cmake
 RUN git clone https://github.com/danielaparker/jsoncons
 
diff --git a/projects/jsoncons/project.yaml b/projects/jsoncons/project.yaml
@@ -10,5 +10,3 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
-
-base_os_version: ubuntu-24-04
diff --git a/projects/kubearmor/Dockerfile b/projects/kubearmor/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-go
 ENV FUZZING_LANGUAGE=go
 RUN git clone https://github.com/kubearmor/KubeArmor
 COPY build.sh $SRC/
diff --git a/projects/kubearmor/project.yaml b/projects/kubearmor/project.yaml
@@ -10,5 +10,4 @@ language: go
 fuzzing_engines:
   - libfuzzer
 sanitizers:
-  - address
-base_os_version: ubuntu-24-04
+  - address
diff --git a/projects/kubeflow-pipelines/Dockerfile b/projects/kubeflow-pipelines/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-go
 RUN git clone --depth 1 https://github.com/kubeflow/pipelines
 WORKDIR pipelines
 COPY build.sh *.go $SRC/
diff --git a/projects/kubeflow-pipelines/project.yaml b/projects/kubeflow-pipelines/project.yaml
@@ -9,5 +9,3 @@ fuzzing_engines:
   - libfuzzer
 sanitizers:
   - address
-
-base_os_version: ubuntu-24-04
diff --git a/projects/libarchive/Dockerfile b/projects/libarchive/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 
 RUN apt-get update && apt-get install -y make autoconf libtool pkg-config \
         libbz2-dev liblzo2-dev liblzma-dev liblz4-dev libz-dev \
diff --git a/projects/libarchive/project.yaml b/projects/libarchive/project.yaml
@@ -10,5 +10,3 @@ sanitizers:
      experimental: True
   - undefined
 main_repo: 'https://github.com/libarchive/libarchive.git'
-
-base_os_version: ubuntu-24-04
diff --git a/projects/libavif/Dockerfile b/projects/libavif/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && \
     apt-get install --no-install-recommends -y curl python3-pip python3-setuptools python3-wheel cmake git nasm && \
     pip3 install meson ninja
diff --git a/projects/libavif/project.yaml b/projects/libavif/project.yaml
@@ -17,5 +17,3 @@ sanitizers:
   - address
   - memory
   - undefined
-
-base_os_version: ubuntu-24-04
diff --git a/projects/libcue/Dockerfile b/projects/libcue/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool bison flex
 
 RUN git clone --depth 1 https://github.com/lipnitsk/libcue.git libcue
diff --git a/projects/libcue/project.yaml b/projects/libcue/project.yaml
@@ -13,5 +13,3 @@ fuzzing_engines:
   - honggfuzz
   - afl
   # - centipede disabled until https://github.com/lipnitsk/libcue/pull/31/
-
-base_os_version: ubuntu-24-04
diff --git a/projects/libmpeg2/Dockerfile b/projects/libmpeg2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y wget cmake
 RUN git clone https://github.com/ittiam-systems/libmpeg2.git
 ADD https://storage.googleapis.com/android_media/external/libmpeg2/fuzzer/mpeg2_dec_fuzzer_seed_corpus.zip $SRC/
diff --git a/projects/libmpeg2/project.yaml b/projects/libmpeg2/project.yaml
@@ -37,5 +37,3 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
-
-base_os_version: ubuntu-24-04
diff --git a/projects/librdkafka/Dockerfile b/projects/librdkafka/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 ################################################################################
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make cmake flex bison zlib1g-dev \
   libcurlpp-dev libcurl4-openssl-dev
 RUN git clone https://github.com/edenhill/librdkafka
diff --git a/projects/librdkafka/project.yaml b/projects/librdkafka/project.yaml
@@ -4,5 +4,3 @@ language: c++
 auto_ccs:
   - "david@adalogics.com"
 main_repo: 'https://github.com/edenhill/librdkafka'
-
-base_os_version: ubuntu-24-04
diff --git a/projects/libxml2/Dockerfile b/projects/libxml2/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 ARG TARGETPLATFORM
 
 RUN apt-get update && \
diff --git a/projects/libxml2/project.yaml b/projects/libxml2/project.yaml
@@ -27,5 +27,3 @@ fuzzing_engines:
   - honggfuzz
   - afl
 main_repo: 'https://gitlab.gnome.org/GNOME/libxml2.git'
-
-base_os_version: ubuntu-24-04
diff --git a/projects/maven-model/Dockerfile b/projects/maven-model/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-jvm:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-jvm
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget
 
 RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.9.5/binaries/apache-maven-3.9.5-bin.zip -o maven.zip && \
diff --git a/projects/maven-model/project.yaml b/projects/maven-model/project.yaml
@@ -7,5 +7,3 @@ fuzzing_engines:
   - libfuzzer
 sanitizers:
   - address
-
-base_os_version: ubuntu-24-04
diff --git a/projects/minify/Dockerfile b/projects/minify/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder-go:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder-go
 RUN git clone --depth 1 https://github.com/tdewolff/minify
 RUN git clone --depth 1 https://github.com/tdewolff/parse
 COPY build.sh $SRC/
diff --git a/projects/minify/project.yaml b/projects/minify/project.yaml
@@ -8,5 +8,3 @@ fuzzing_engines:
 sanitizers:
   - address
 main_repo: 'https://github.com/tdewolff/minify'
-
-base_os_version: ubuntu-24-04
diff --git a/projects/mpg123/Dockerfile b/projects/mpg123/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake libtool wget \
   bzip2
 RUN wget https://www.mpg123.de/snapshot
diff --git a/projects/mpg123/project.yaml b/projects/mpg123/project.yaml
@@ -12,5 +12,3 @@ labels:
     - sundew
   decode_fuzzer:
     - sundew
-
-base_os_version: ubuntu-24-04
diff --git a/projects/muduo/Dockerfile b/projects/muduo/Dockerfile
@@ -14,7 +14,7 @@
 #
 ################################################################################
 
-FROM gcr.io/oss-fuzz-base/base-builder:ubuntu-24-04
+FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make libboost-dev
 RUN git clone --depth 1 https://github.com/chenshuo/muduo
 WORKDIR muduo
diff --git a/projects/muduo/project.yaml b/projects/muduo/project.yaml
@@ -14,5 +14,3 @@ fuzzing_engines:
   - honggfuzz
   - libfuzzer
 
-
-base_os_version: ubuntu-24-04

-Original file line number
+Diff line change
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"
 -  - "[email protected]"
 -base_os_version: ubuntu-24-04
 +  - "[email protected]"
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:ubuntu-24-04`
	`17`	`+FROM gcr.io/oss-fuzz-base/base-builder-jvm`
`18`	`18`
`19`	`19`	`RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.zip -o maven.zip && \`
`20`	`20`	`unzip maven.zip -d $SRC/maven && \`