aboutsummaryrefslogtreecommitdiff
path: root/infra
diff options
context:
space:
mode:
authorjonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>2021-08-27 09:52:18 -0700
committerGitHub <noreply@github.com>2021-08-27 09:52:18 -0700
commitc8d4d35f57c5952f3b5ca7c5d2ffd819201bc6cd (patch)
treea8e3c18c2ebbf850d63658b23b5f88cf509e4969 /infra
parent7ad8b14a3478f12dcea8db3e454faae54c9ef440 (diff)
downloadoss-fuzz-c8d4d35f57c5952f3b5ca7c5d2ffd819201bc6cd.tar.gz
[infra] Do precompiles first before copying other scripts. (#6337)
This means we don't need to rebuild AFL++ and honggfuzz when iteratively working on scripts.
Diffstat (limited to 'infra')
-rw-r--r--infra/base-images/base-builder-new/Dockerfile12
1 files changed, 8 insertions, 4 deletions
diff --git a/infra/base-images/base-builder-new/Dockerfile b/infra/base-images/base-builder-new/Dockerfile
index 261ae8335..70ea7c47e 100644
--- a/infra/base-images/base-builder-new/Dockerfile
+++ b/infra/base-images/base-builder-new/Dockerfile
@@ -134,8 +134,15 @@ RUN cd $SRC && \
tar -xzv --strip-components=1 -f $SRC/oss-fuzz.tar.gz && \
rm -rf examples $SRC/oss-fuzz.tar.gz
+# Do precompiles before copying other scripts for better cache efficiency.
+COPY precompile_afl /usr/local/bin/
+RUN precompile_afl
+
+COPY precompile_honggfuzz /usr/local/bin/
+RUN precompile_honggfuzz
+
COPY compile compile_afl compile_dataflow compile_libfuzzer compile_honggfuzz \
- precompile_honggfuzz precompile_afl debug_afl srcmap bazel_build_fuzz_tests \
+ debug_afl srcmap bazel_build_fuzz_tests \
write_labels.py \
# Swift installation
install_swift.sh \
@@ -144,7 +151,4 @@ COPY compile compile_afl compile_dataflow compile_libfuzzer compile_honggfuzz \
COPY llvmsymbol.diff $SRC
COPY detect_repo.py /opt/cifuzz/
-RUN precompile_honggfuzz
-RUN precompile_afl
-
CMD ["compile"]