diff options
| author | AdamKorcz <44787359+AdamKorcz@users.noreply.github.com> | 2020-04-13 21:56:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-13 13:56:09 -0700 |
| commit | d31872b9c2533011072dff52931ea7c087b09095 (patch) | |
| tree | 9a61cd769b3755dfc5559d7c47ae3710cc182968 /projects/nanopb | |
| parent | 9e6fc1ed39aef7cfddf2fd7d8ce77d1585119d1b (diff) | |
| download | oss-fuzz-d31872b9c2533011072dff52931ea7c087b09095.tar.gz | |
Fixed broken build of nanopb and switched to pip3 (#3637)
Diffstat (limited to 'projects/nanopb')
| -rw-r--r-- | projects/nanopb/Dockerfile | 4 | ||||
| -rwxr-xr-x | projects/nanopb/build.sh | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/projects/nanopb/Dockerfile b/projects/nanopb/Dockerfile index 5ddb2ffaf..d483e2edf 100644 --- a/projects/nanopb/Dockerfile +++ b/projects/nanopb/Dockerfile @@ -16,8 +16,8 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER jpa@npb.mail.kapsi.fi -RUN apt-get update && apt-get install -y python-pip git scons -RUN pip install protobuf grpcio-tools +RUN apt-get update && apt-get install -y python3-pip git scons wget +RUN python3 -m pip install --upgrade pip RUN git clone --depth 1 https://github.com/nanopb/nanopb $SRC/nanopb COPY build.sh $SRC/ diff --git a/projects/nanopb/build.sh b/projects/nanopb/build.sh index f9fc81cd3..f62dfae14 100755 --- a/projects/nanopb/build.sh +++ b/projects/nanopb/build.sh @@ -15,6 +15,12 @@ # ################################################################################ +wget "https://repo.anaconda.com/archive/Anaconda3-2020.02-Linux-x86_64.sh" +bash "Anaconda3-2020.02-Linux-x86_64.sh" -b +export PATH=~/anaconda3/bin:$PATH +conda install protobuf -y +pip3 install grpcio-tools + cd $SRC/nanopb/tests # Build seed corpus. |