Skip to content

Commit cce0deb

Browse files
author
Paulo Gomes
committed
fuzz: Ensure latest base images are used
Latest base image should contain Go 1.18, removing the need of updating that ourselves, apart from benefiting from latest changes upstream. Signed-off-by: Paulo Gomes <paulo.gomes@weave.works>
1 parent c657c60 commit cce0deb

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ fuzz-build:
151151
rm -rf $(BUILD_DIR)/fuzz/
152152
mkdir -p $(BUILD_DIR)/fuzz/out/
153153

154-
docker build . --tag local-fuzzing:latest -f tests/fuzz/Dockerfile.builder
154+
docker build . --pull --tag local-fuzzing:latest -f tests/fuzz/Dockerfile.builder
155155
docker run --rm \
156156
-e FUZZING_LANGUAGE=go -e SANITIZER=address \
157157
-e CIFUZZ_DEBUG='True' -e OSS_FUZZ_PROJECT_NAME=fluxcd \

tests/fuzz/Dockerfile.builder

-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
FROM golang:1.18 AS go
2-
31
FROM gcr.io/oss-fuzz-base/base-builder-go
42

5-
# ensures golang 1.18 to enable go native fuzzing.
6-
COPY --from=go /usr/local/go /usr/local/
7-
83
COPY ./ $GOPATH/src/github.com/fluxcd/helm-controller/
94
COPY ./tests/fuzz/oss_fuzz_build.sh $SRC/build.sh
105

0 commit comments

Comments
 (0)