From 18f3e3231d7f1a965e0079bc296477d366a149ae Mon Sep 17 00:00:00 2001 From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> Date: Mon, 6 Feb 2023 19:34:38 -0500 Subject: [PATCH] Don't hold back images that can be upgraded. (#9602) This allows these projects to be compiled with centipede Related: https://github.com/google/oss-fuzz/issues/9583 --- projects/bearssl/Dockerfile | 4 +--- projects/libecc/Dockerfile | 4 +--- projects/nettle/Dockerfile | 4 +--- projects/num-bigint/Dockerfile | 4 +--- projects/relic/Dockerfile | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/projects/bearssl/Dockerfile b/projects/bearssl/Dockerfile index f5d01e518..e19062003 100644 --- a/projects/bearssl/Dockerfile +++ b/projects/bearssl/Dockerfile @@ -14,9 +14,7 @@ # ################################################################################ -# Held back because of github.com/google/oss-fuzz/pull/8313 -# Please fix failure and upgrade. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool wget python RUN git clone --depth 1 https://www.bearssl.org/git/BearSSL RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/libecc/Dockerfile b/projects/libecc/Dockerfile index 491b8ff39..948d36aa0 100644 --- a/projects/libecc/Dockerfile +++ b/projects/libecc/Dockerfile @@ -14,9 +14,7 @@ # ################################################################################ -# Held back because of github.com/google/oss-fuzz/pull/8313 -# Please fix failure and upgrade. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool wget python bison flex texinfo lzip RUN git clone --depth 1 --branch cryptofuzz https://github.com/libecc/libecc.git RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/nettle/Dockerfile b/projects/nettle/Dockerfile index 75f2835fa..d88fe2be6 100644 --- a/projects/nettle/Dockerfile +++ b/projects/nettle/Dockerfile @@ -14,9 +14,7 @@ # ################################################################################ -# Held back because of github.com/google/oss-fuzz/pull/8313 -# Please fix failure and upgrade. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f +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/num-bigint/Dockerfile b/projects/num-bigint/Dockerfile index 6dd0a03e1..918cd6956 100644 --- a/projects/num-bigint/Dockerfile +++ b/projects/num-bigint/Dockerfile @@ -14,9 +14,7 @@ # ################################################################################ -# Held back because of github.com/google/oss-fuzz/pull/8313 -# Please fix failure and upgrade. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool wget python RUN git clone --depth 1 https://github.com/guidovranken/cryptofuzz RUN git clone --depth 1 https://github.com/randombit/botan.git diff --git a/projects/relic/Dockerfile b/projects/relic/Dockerfile index 68380532b..9bd88059a 100644 --- a/projects/relic/Dockerfile +++ b/projects/relic/Dockerfile @@ -14,9 +14,7 @@ # ################################################################################ -# Held back because of github.com/google/oss-fuzz/pull/8313 -# Please fix failure and upgrade. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:111d6b9d3a52bd3392602c71dc8936c628607a7a9bc86d381db7586f9b1e840f +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool wget python RUN git clone --depth 1 https://github.com/relic-toolkit/relic.git RUN git clone --depth 1 https://github.com/randombit/botan.git