Move various sed operations from build.sh to Dockerfile.

To make build.sh more idempotent.

Author: oliverchang

projects/astc-encoder/Dockerfile

@@ -19,3 +19,4 @@ RUN apt-get update && apt-get install -y make autoconf automake libtool
 RUN git clone --depth 1 https://github.com/ARM-software/astc-encoder
 WORKDIR astc-encoder/Source
 COPY build.sh $SRC/
+RUN sed -i 's/c++14/c++17/g' $SRC/astc-encoder/Source/Fuzzers/build.sh

projects/astc-encoder/build.sh

@@ -16,5 +16,4 @@
 ################################################################################
 
 # build project and project-hosted fuzzers
-sed -i 's/c++14/c++17/g' $SRC/astc-encoder/Source/Fuzzers/build.sh
 $SRC/astc-encoder/Source/Fuzzers/build.sh

projects/clickhouse/Dockerfile

@@ -42,5 +42,10 @@ RUN apt-get update -y \
 
 RUN git clone -j 8 --recursive https://github.com/ClickHouse/ClickHouse $SRC/ClickHouse
 WORKDIR $SRC/ClickHouse
+# It will be hard to maintain any compilation fails (if any) in two repositories.
+# Also ClickHouse won't compile without this.
+# It is very strange, because we have as many warnings as you could imagine.
+RUN sed -i -e '/warnings.cmake)/d' $SRC/ClickHouse/CMakeLists.txt && \
+    sed -i -e 's/add_warning(/no_warning(/g' $SRC/ClickHouse/CMakeLists.txt
 
 COPY build.sh $SRC/

projects/clickhouse/build.sh

@@ -21,13 +21,6 @@ mkdir -p $SRC/ClickHouse/build && cd $SRC/ClickHouse/build
 [ -e CMakeLists ] && rm -rf CMakeFiles
 [ -e CMakeCache.txt ] && rm -rf CMakeCache.txt
 
-sed -i -e '/warnings.cmake)/d' $SRC/ClickHouse/CMakeLists.txt
-
-# It will be hard to maintain any compilation fails (if any) in two repositories.
-# Also ClickHouse won't compile without this.
-# It is very strange, because we have as many warnings as you could imagine.
-sed -i -e 's/add_warning(/no_warning(/g' $SRC/ClickHouse/CMakeLists.txt
-
 # ClickHouse uses libcxx from contrib.
 # Enabling libstdc++ manually will cause duplicate symbols at linker stage.
 # Plus we want to fuzz the same binary as we have in our CI

projects/libgd/Dockerfile

@@ -21,3 +21,7 @@ RUN git clone --depth 1 https://github.com/libgd/libgd
 ADD https://lcamtuf.coredump.cx/afl/demo/afl_testcases.tgz $SRC/afl_testcases.tgz
 WORKDIR libgd
 COPY run_tests.sh build.sh *.cc $SRC/
+RUN sed -i 's/-Werror//g' configure.ac && \
+    # Limit the size of buffer allocations to avoid bogus OOM issues
+    # https://github.com/libgd/libgd/issues/422
+    sed -i 's/INT_MAX/100000/' src/gd_security.c

projects/libgd/build.sh

@@ -15,13 +15,8 @@
 #
 ################################################################################
 
-sed -i 's/-Werror//g' ./configure.ac
 ./bootstrap.sh
 
-# Limit the size of buffer allocations to avoid bogus OOM issues
-# https://github.com/libgd/libgd/issues/422
-sed -i'' -e 's/INT_MAX/100000/' "$SRC/libgd/src/gd_security.c"
-
 ./configure --prefix="$WORK" --disable-shared
 make -j$(nproc) install
 

projects/llamacpp/Dockerfile

@@ -18,5 +18,14 @@ FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt-get install -y make autoconf automake xxd
 RUN git clone https://github.com/ggerganov/llama.cpp
 WORKDIR $SRC/llama.cpp
+# Avoid function that forks + starts instance of gdb.
+# Remove statefulness during fuzzing.
+# Patch callocs to avoid allocating large chunks.
+# Patch a potentially unbounded loop that causes timeouts
+RUN sed -i 's/ggml_print_backtrace();//g' ./ggml/src/ggml.c && \
+    sed -i 's/static bool is_first_call/bool is_first_call/g' ./ggml/src/ggml.c && \
+    sed -i 's/ggml_calloc(size_t num, size_t size) {/ggml_calloc(size_t num, size_t size) {\nif ((num * size) > 9000000) {GGML_ABORT("calloc err");}\n/g' ./ggml/src/ggml.c && \
+    sed -i 's/ok = ok \&\& (info->n_dims <= GGML_MAX_DIMS);/ok = ok \&\& (info->n_dims <= GGML_MAX_DIMS);\nif (!ok) {fclose(file); gguf_free(ctx); return NULL;}/g' ./ggml/src/ggml.c
+
 COPY build.sh $SRC/
 COPY fuzzers $SRC/llama.cpp/fuzzers

projects/llamacpp/build.sh

@@ -17,18 +17,6 @@
 
 export GGML_NO_OPENMP=1
 
-# Avoid function that forks + starts instance of gdb.
-sed -i 's/ggml_print_backtrace();//g' ./ggml/src/ggml.c
-
-# Remove statefulness during fuzzing.
-sed -i 's/static bool is_first_call/bool is_first_call/g' ./ggml/src/ggml.c
-
-# Patch callocs to avoid allocating large chunks.
-sed -i 's/ggml_calloc(size_t num, size_t size) {/ggml_calloc(size_t num, size_t size) {\nif ((num * size) > 9000000) {GGML_ABORT("calloc err");}\n/g' -i ./ggml/src/ggml.c
-
-# Patch a potentially unbounded loop that causes timeouts
-sed -i 's/ok = ok \&\& (info->n_dims <= GGML_MAX_DIMS);/ok = ok \&\& (info->n_dims <= GGML_MAX_DIMS);\nif (!ok) {fclose(file); gguf_free(ctx); return NULL;}/g' ./ggml/src/ggml.c
-
 # Build with CMake
 mkdir build
 cd build

projects/openbabel/Dockerfile

@@ -17,5 +17,9 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 RUN apt-get update && apt install -y cmake
 RUN git clone --depth 1 https://github.com/openbabel/openbabel.git
-COPY *.sh $SRC/
 WORKDIR $SRC/openbabel
+# Remove use of deprecated functions
+RUN sed -i 's/CMAKE_CXX_STANDARD 11/CMAKE_CXX_STANDARD 17/g' CMakeLists.txt && \
+    sed -i 's/std::random/\/\/std::random/g' test/*.cpp
+
+COPY *.sh $SRC/

projects/openbabel/build.sh

@@ -16,10 +16,6 @@
 ################################################################################
 
 export CXXFLAGS="${CXXFLAGS} -std=c++17"
-sed -i 's/CMAKE_CXX_STANDARD 11/CMAKE_CXX_STANDARD 17/g' CMakeLists.txt
-
-# Remove use of deprecated functions
-sed -i 's/std::random/\/\/std::random/g' test/*.cpp
 
 # build project
 mkdir build && cd build