aboutsummaryrefslogtreecommitdiff
path: root/infra/base-images/base-builder
diff options
context:
space:
mode:
authorStefan Bucur <281483+stefanbucur@users.noreply.github.com>2021-02-03 11:09:04 -0500
committerGitHub <noreply@github.com>2021-02-03 08:09:04 -0800
commit50cb57808e1b8665aa907e1452983a534869bf3e (patch)
tree098564a2f64c4d8beb6e5bb09a623f269764390b /infra/base-images/base-builder
parent23622cd4da4407d2b92d40f590ea8eb18ba05393 (diff)
downloadoss-fuzz-50cb57808e1b8665aa907e1452983a534869bf3e.tar.gz
Simplify the Envoy integration by using the new rules_fuzzing primitives. (#5062)
* Simplify the Envoy integration by using the new rules_fuzzing primitives. * Tweak ASAN instrumentation.
Diffstat (limited to 'infra/base-images/base-builder')
-rw-r--r--infra/base-images/base-builder/Dockerfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile
index 04372ab40..408ed98f6 100644
--- a/infra/base-images/base-builder/Dockerfile
+++ b/infra/base-images/base-builder/Dockerfile
@@ -59,8 +59,10 @@ RUN export PYTHON_DEPS="\
rm -r /tmp/Python-$PYTHON_VERSION.tar.xz /tmp/Python-$PYTHON_VERSION && \
apt-get remove -y $PYTHON_DEPS # https://github.com/google/oss-fuzz/issues/3888
-# Install latest atheris for python fuzzing, pyinstaller for fuzzer packaging.
-RUN unset CFLAGS CXXFLAGS && pip3 install -v atheris pyinstaller==4.1
+# Install latest atheris for python fuzzing, pyinstaller for fuzzer packaging,
+# six for Bazel rules.
+RUN unset CFLAGS CXXFLAGS && pip3 install -v \
+ atheris pyinstaller==4.1 six==1.15.0
# Download and install the latest stable Go.
RUN cd /tmp && \