From 1c5c258a49303068b81d7813d53a88aa31b626e7 Mon Sep 17 00:00:00 2001
From: Daiki Ueno <dueno@redhat.com>
Date: Sun, 19 Sep 2021 12:29:12 +0200
Subject: [PATCH] gnutls: Use default focal image (#6473) (#6479)

The gnutls build should be fixed with:
https://gitlab.com/gnutls/gnutls/-/commit/c3137e17356c798ea4c9327a37c0693a500571ae
---
 projects/gnutls/Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/projects/gnutls/Dockerfile b/projects/gnutls/Dockerfile
index 7043aa48a..5d902272e 100644
--- a/projects/gnutls/Dockerfile
+++ b/projects/gnutls/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 apt-get update && apt-get install -y \
  make \
  pkg-config \