diff options
| author | Tyson Smith <tysmith@users.noreply.github.com> | 2020-08-20 18:43:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-20 18:43:30 -0700 |
| commit | f0c4879cc426b06ce25359d1c41be22584e3d958 (patch) | |
| tree | bc75aa6b946e2686cc6ff7dd2b25adea68d899e3 /projects/firefox | |
| parent | aa807fcd8a9f613bf08e076e6e932f108c3720b5 (diff) | |
| download | oss-fuzz-f0c4879cc426b06ce25359d1c41be22584e3d958.tar.gz | |
[firefox] Call 'mach bootstrap' in Dockerfile and build.sh (#4345)
Diffstat (limited to 'projects/firefox')
| -rw-r--r-- | projects/firefox/Dockerfile | 9 | ||||
| -rwxr-xr-x | projects/firefox/build.sh | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/projects/firefox/Dockerfile b/projects/firefox/Dockerfile index 39725c61e..18543d582 100644 --- a/projects/firefox/Dockerfile +++ b/projects/firefox/Dockerfile @@ -16,15 +16,16 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN add-apt-repository -y ppa:ubuntu-toolchain-r/test -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends \ + gawk \ libstdc++6 \ python \ - gawk \ software-properties-common RUN git clone --depth 1 https://github.com/mozilla/gecko-dev mozilla-central RUN git clone --depth 1 https://github.com/mozillasecurity/fuzzdata WORKDIR mozilla-central -COPY build.sh target.c *.options mozconfig.* $SRC/ -# Install dependencies. +# Install OS dependencies. +# Will be re-run in build.sh to install missing dependencies. ENV SHELL /bin/bash RUN ./mach bootstrap --no-interactive --application-choice browser +COPY build.sh target.c *.options mozconfig.* $SRC/ diff --git a/projects/firefox/build.sh b/projects/firefox/build.sh index 431cfb8a6..a41b99bc8 100755 --- a/projects/firefox/build.sh +++ b/projects/firefox/build.sh @@ -42,7 +42,9 @@ FUZZ_TARGETS=( export MOZ_OBJDIR=$WORK/obj-fuzz export MOZCONFIG=$SRC/mozconfig.$SANITIZER +# Install remaining dependencies. export SHELL=/bin/bash +./mach bootstrap --no-interactive --application-choice browser # Skip patches for now rm tools/fuzzing/libfuzzer/patches/*.patch |