diff --git a/projects/bitcoin-core/Dockerfile b/projects/bitcoin-core/Dockerfile index 5f10c6c79..9670b3c6b 100644 --- a/projects/bitcoin-core/Dockerfile +++ b/projects/bitcoin-core/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder # Packages taken from: # * https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md#dependency-build-instructions diff --git a/projects/gdal/Dockerfile b/projects/gdal/Dockerfile index 00f072373..4ecf0fe2f 100644 --- a/projects/gdal/Dockerfile +++ b/projects/gdal/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# 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 diff --git a/projects/gnutls/Dockerfile b/projects/gnutls/Dockerfile index 5d902272e..7043aa48a 100644 --- a/projects/gnutls/Dockerfile +++ b/projects/gnutls/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y \ make \ pkg-config \ diff --git a/projects/gstreamer/Dockerfile b/projects/gstreamer/Dockerfile index 46318a5c3..a09c0f559 100644 --- a/projects/gstreamer/Dockerfile +++ b/projects/gstreamer/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder # Install the build dependencies # install the minimum diff --git a/projects/hermes/Dockerfile b/projects/hermes/Dockerfile index eb59a38da..360878fba 100644 --- a/projects/hermes/Dockerfile +++ b/projects/hermes/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && \ apt-get install -y make autoconf automake libtool wget libicu-dev \ ninja-build python zip libreadline-dev libatomic-ops-dev diff --git a/projects/libarchive/Dockerfile b/projects/libarchive/Dockerfile index bd076691e..99789fa0c 100644 --- a/projects/libarchive/Dockerfile +++ b/projects/libarchive/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder # Installing optional libraries can utilize more code path and/or improve # performance (avoid calling external programs). diff --git a/projects/libass/Dockerfile b/projects/libass/Dockerfile index b0758cef1..9cd284493 100644 --- a/projects/libass/Dockerfile +++ b/projects/libass/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool pkg-config libfreetype6-dev libfontconfig1-dev python3-pip && \ pip3 install meson==0.53.0 ninja diff --git a/projects/libphonenumber/Dockerfile b/projects/libphonenumber/Dockerfile index c75d78c58..2f2a539d8 100644 --- a/projects/libphonenumber/Dockerfile +++ b/projects/libphonenumber/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y autoconf automake libtool g++ cmake-curses-gui libgtest-dev libre2-dev libicu-dev libboost-dev libboost-thread-dev libboost-system-dev binutils ninja-build liblzma-dev libz-dev pkg-config wget openjdk-8-jdk WORKDIR $SRC/ diff --git a/projects/libvips/Dockerfile b/projects/libvips/Dockerfile index d10e00043..dd0de8d9b 100644 --- a/projects/libvips/Dockerfile +++ b/projects/libvips/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y \ curl \ automake \ diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile index b7b987cb9..e1547f5be 100644 --- a/projects/nettle/Dockerfile +++ b/projects/nettle/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get install -y software-properties-common make autoconf build-essential wget lzip libtool python RUN git clone --depth 1 https://git.lysator.liu.se/nettle/nettle RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/osquery/Dockerfile b/projects/osquery/Dockerfile index c1c8ff513..de433c8f6 100755 --- a/projects/osquery/Dockerfile +++ b/projects/osquery/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update RUN apt-get install -y --no-install-recommends python python3 bison flex make wget xz-utils libunwind-dev diff --git a/projects/proxygen/Dockerfile b/projects/proxygen/Dockerfile index 7899ed2a6..c3e228448 100644 --- a/projects/proxygen/Dockerfile +++ b/projects/proxygen/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder # Install packages we need to build dependencies RUN apt-get update && \ diff --git a/projects/samba/Dockerfile b/projects/samba/Dockerfile index 3d3ee35ad..e2d7f54b9 100644 --- a/projects/samba/Dockerfile +++ b/projects/samba/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN git clone https://gitlab.com/samba-team/samba samba RUN samba/lib/fuzzing/oss-fuzz/build_image.sh diff --git a/projects/thrift/Dockerfile b/projects/thrift/Dockerfile index 040188316..8c1b83a00 100644 --- a/projects/thrift/Dockerfile +++ b/projects/thrift/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y libssl-dev pkg-config autoconf automake libtool bison flex libboost-all-dev RUN git clone --depth 1 https://github.com/apache/thrift WORKDIR $SRC/thrift diff --git a/projects/tor/Dockerfile b/projects/tor/Dockerfile index 3211c40be..8c9615115 100644 --- a/projects/tor/Dockerfile +++ b/projects/tor/Dockerfile @@ -14,7 +14,11 @@ # ############################################################################## -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y autoconf automake make libtool pkg-config RUN git clone --depth 1 https://git.torproject.org/tor.git RUN git clone --depth 1 https://git.torproject.org/fuzzing-corpora.git tor-fuzz-corpora diff --git a/projects/wasm3/Dockerfile b/projects/wasm3/Dockerfile index 1d123adb2..b2b3119bb 100644 --- a/projects/wasm3/Dockerfile +++ b/projects/wasm3/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make RUN git clone --depth 1 https://github.com/wasm3/wasm3 WORKDIR wasm3 diff --git a/projects/wget/Dockerfile b/projects/wget/Dockerfile index 2382da6ec..2d2583e4c 100644 --- a/projects/wget/Dockerfile +++ b/projects/wget/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y \ make \ pkg-config \ diff --git a/projects/wget2/Dockerfile b/projects/wget2/Dockerfile index bc2451ea5..ffff58e4f 100644 --- a/projects/wget2/Dockerfile +++ b/projects/wget2/Dockerfile @@ -14,7 +14,11 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder +# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. +# See https://github.com/google/oss-fuzz/issues/6291 for more details. +FROM gcr.io/oss-fuzz-base/base-builder:xenial +# Delete line above and uncomment line below to upgrade to 20.04. +# FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y \ make \ pkg-config \