From 7e5ede0617e794d0a463ffcf674b6a0fa13addb4 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Thu, 9 Sep 2021 22:12:55 +1200 Subject: [PATCH] Samba builds now expect Ubuntu 20.04 (#6419) Per #6302 and https://github.com/google/oss-fuzz/issues/6301#issuecomment-911705365 Samba needed, and now did upgrade the build scripts to run on Ubuntu 20.04. See https://github.com/samba-team/samba/commit/4366c3bb71fe9c083dedeae8798547b64a64d2b4 --- projects/samba/Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/projects/samba/Dockerfile b/projects/samba/Dockerfile index e2d7f54b9..3d3ee35ad 100644 --- a/projects/samba/Dockerfile +++ b/projects/samba/Dockerfile @@ -14,11 +14,7 @@ # ################################################################################ -# Using Ubuntu 16.04 because of breakage on Ubuntu 20.04. -# See https://github.com/google/oss-fuzz/issues/6291 for more details. -FROM gcr.io/oss-fuzz-base/base-builder:xenial -# Delete line above and uncomment line below to upgrade to 20.04. -# FROM gcr.io/oss-fuzz-base/base-builder +FROM gcr.io/oss-fuzz-base/base-builder RUN git clone https://gitlab.com/samba-team/samba samba RUN samba/lib/fuzzing/oss-fuzz/build_image.sh