aboutsummaryrefslogtreecommitdiff
path: root/projects
diff options
context:
space:
mode:
authorDavidKorczynski <david@adalogics.com>2021-09-21 21:25:57 +0100
committerGitHub <noreply@github.com>2021-09-21 21:25:57 +0100
commit547f1b61cd99543843f8de23e40b97a15dfa79e8 (patch)
tree34abe519755d61826e8b162911ca92665359169f /projects
parent2b3ce49d7779cd70a40e3d57905819a945f001c5 (diff)
downloadoss-fuzz-547f1b61cd99543843f8de23e40b97a15dfa79e8.tar.gz
spdk: simplify build (#6503)
Diffstat (limited to 'projects')
-rw-r--r--projects/spdk/Dockerfile13
1 files changed, 4 insertions, 9 deletions
diff --git a/projects/spdk/Dockerfile b/projects/spdk/Dockerfile
index 756d33c7e..9ac85748e 100644
--- a/projects/spdk/Dockerfile
+++ b/projects/spdk/Dockerfile
@@ -15,14 +15,9 @@
################################################################################
FROM gcr.io/oss-fuzz-base/base-builder
-RUN apt-get update && apt-get install -y make curl yasm autoconf libtool meson
-RUN git clone --depth 1 https://github.com/spdk/spdk
-RUN mkdir nasm-2.15 && cd nasm-2.15 && \
- curl -O -L https://www.nasm.us/pub/nasm/releasebuilds/2.15.05/nasm-2.15.05.tar.xz && \
- tar -xf nasm-2.15.05.tar.xz --strip-components=1 && \
- ./configure --prefix=/usr && \
- make -j$(nproc) && \
- make -j$(nproc) install
+RUN apt-get update && apt-get install -y make curl yasm autoconf libtool meson nasm
+RUN git clone --depth 1 https://github.com/spdk/spdk && \
+ cd spdk && \
+ git submodule update --init
WORKDIR $SRC/spdk
-RUN git submodule update --init
COPY build.sh parse_json_fuzzer.cc $SRC/