diff --git a/projects/istio/Dockerfile b/projects/istio/Dockerfile index e9ddcdd95..542203eef 100644 --- a/projects/istio/Dockerfile +++ b/projects/istio/Dockerfile @@ -17,5 +17,10 @@ # Setup the builder for Istio. The standard Go builder is sufficient. FROM gcr.io/oss-fuzz-base/base-builder-go RUN git clone --depth 1 https://github.com/istio/istio +RUN wget https://go.dev/dl/go1.20.2.linux-amd64.tar.gz \ + && mkdir temp-go \ + && rm -rf /root/.go/* \ + && tar -C temp-go/ -xzf go1.20.2.linux-amd64.tar.gz \ + && mv temp-go/go/* /root/.go/ COPY build.sh $SRC/ WORKDIR $SRC/istio diff --git a/projects/istio/build.sh b/projects/istio/build.sh index d6de5c586..d05a47ab3 100644 --- a/projects/istio/build.sh +++ b/projects/istio/build.sh @@ -15,6 +15,10 @@ # ################################################################################ +# required by Go 1.20 +export CXX="${CXX} -lresolv" + +# Build fuzzers if [ -n "${OSS_FUZZ_CI-}" ] then echo "Skipping most fuzzers since the OSS-fuzz CI may fail from running out of disk space."