diff options
| author | jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2021-03-23 09:29:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-23 16:29:34 +0000 |
| commit | ff8c92786520af1170a12b9ab66073405451e02c (patch) | |
| tree | 445b4bb86ba6e1fff161f6259c9b9788b79d505c | |
| parent | 00ad715801a8d3a2041b571968526221b7d9668f (diff) | |
| download | oss-fuzz-ff8c92786520af1170a12b9ab66073405451e02c.tar.gz | |
[grpc] Fix build (#5483)
Also, update base-builder version.
Fixes: #3157
| -rw-r--r-- | projects/grpc/Dockerfile | 7 | ||||
| -rwxr-xr-x | projects/grpc/build.sh | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/projects/grpc/Dockerfile b/projects/grpc/Dockerfile index 69f44b2f0..6d2a31074 100644 --- a/projects/grpc/Dockerfile +++ b/projects/grpc/Dockerfile @@ -14,9 +14,7 @@ # ################################################################################ -# TODO(https://github.com/google/oss-fuzz/issues/3093): Stop specifying the -# image SHA once the bug is fixed. -FROM gcr.io/oss-fuzz-base/base-builder@sha256:276813aef0ce5972db43c0230f96162003994fa742fb1b2f4e66c67498575c65 +FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y software-properties-common python-software-properties RUN add-apt-repository ppa:webupd8team/java @@ -27,7 +25,8 @@ RUN apt-get update && apt-get -y install \ make \ curl \ autoconf \ - libtool + libtool \ + rsync # Install dependencies diff --git a/projects/grpc/build.sh b/projects/grpc/build.sh index 85831535a..fc82bac30 100755 --- a/projects/grpc/build.sh +++ b/projects/grpc/build.sh @@ -24,7 +24,7 @@ readonly FUZZER_DICTIONARIES=( readonly FUZZER_TARGETS=( test/core/json:json_fuzzer - test/core/client_channel:uri_fuzzer_test + test/core/uri:uri_fuzzer_test test/core/http:request_fuzzer test/core/http:response_fuzzer test/core/nanopb:fuzzer_response @@ -129,7 +129,7 @@ cp ${SRC}/grpc/tools/fuzzer/options/*.options "${OUT}/" # We don't have a consistent naming convention between fuzzer files and corpus # directories so we resort to hard coding zipping corpuses zip "${OUT}/json_fuzzer_seed_corpus.zip" test/core/json/corpus/* -zip "${OUT}/uri_fuzzer_test_seed_corpus.zip" test/core/client_channel/uri_corpus/* +zip "${OUT}/uri_fuzzer_test_seed_corpus.zip" test/core/uri/uri_corpus/* zip "${OUT}/request_fuzzer_seed_corpus.zip" test/core/http/request_corpus/* zip "${OUT}/response_fuzzer_seed_corpus.zip" test/core/http/response_corpus/* zip "${OUT}/fuzzer_response_seed_corpus.zip" test/core/nanopb/corpus_response/* |