From 9612e9f13699556ec9585523d9a0033b919fefb2 Mon Sep 17 00:00:00 2001 From: sudipto baral Date: Tue, 28 Oct 2025 23:46:30 -0400 Subject: [PATCH 1/2] gateway: fix broken fuzzing build by upgrading golang version. --- projects/gateway/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/gateway/Dockerfile b/projects/gateway/Dockerfile index ce0609ff6e22..2789d39cc101 100644 --- a/projects/gateway/Dockerfile +++ b/projects/gateway/Dockerfile @@ -16,12 +16,12 @@ FROM gcr.io/oss-fuzz-base/base-builder-go -RUN wget https://go.dev/dl/go1.24.0.linux-amd64.tar.gz \ +RUN wget https://go.dev/dl/go1.25.3.linux-amd64.tar.gz \ && mkdir temp-go \ && rm -rf /root/.go/* \ - && tar -C temp-go/ -xzf go1.24.0.linux-amd64.tar.gz \ + && tar -C temp-go/ -xzf go1.25.3.linux-amd64.tar.gz \ && mv temp-go/go/* /root/.go/ \ - && rm -rf temp-go go1.24.0.linux-amd64.tar.gz \ + && rm -rf temp-go go1.25.3.linux-amd64.tar.gz \ && apt-get update \ && apt-get install -y btrfs-progs libbtrfs-dev From ad9fa3855233c78821abdae40fd3005a219eb0e1 Mon Sep 17 00:00:00 2001 From: sudipto baral Date: Wed, 29 Oct 2025 20:15:38 -0400 Subject: [PATCH 2/2] gateway: extract go version from go mod and install --- projects/gateway/Dockerfile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/projects/gateway/Dockerfile b/projects/gateway/Dockerfile index 2789d39cc101..284e5720c295 100644 --- a/projects/gateway/Dockerfile +++ b/projects/gateway/Dockerfile @@ -16,15 +16,18 @@ FROM gcr.io/oss-fuzz-base/base-builder-go -RUN wget https://go.dev/dl/go1.25.3.linux-amd64.tar.gz \ - && mkdir temp-go \ - && rm -rf /root/.go/* \ - && tar -C temp-go/ -xzf go1.25.3.linux-amd64.tar.gz \ - && mv temp-go/go/* /root/.go/ \ - && rm -rf temp-go go1.25.3.linux-amd64.tar.gz \ - && apt-get update \ +RUN apt-get update \ && apt-get install -y btrfs-progs libbtrfs-dev RUN git clone --depth 1 https://github.com/envoyproxy/gateway.git +RUN cd $SRC/gateway && \ + GO_VERSION=$(grep -oP '^go \K[0-9]+\.[0-9]+(\.[0-9]+)?' go.mod | head -1) && \ + wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && \ + mkdir temp-go && \ + rm -rf /root/.go/* && \ + tar -C temp-go/ -xzf go${GO_VERSION}.linux-amd64.tar.gz && \ + mv temp-go/go/* /root/.go/ && \ + rm -rf temp-go go${GO_VERSION}.linux-amd64.tar.gz + COPY build.sh $SRC/ \ No newline at end of file