From 7ca003732dfedb82c6dc189e21f6d3d3ff17d25f Mon Sep 17 00:00:00 2001
From: jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com>
Date: Thu, 26 Aug 2021 09:53:40 -0700
Subject: [PATCH] [Ubuntu upgrade] Upgrade images to Ubuntu 20.04 (#6305)

Related: #6180.
---
 infra/base-images/base-clang/checkout_build_install_llvm.sh | 2 +-
 infra/base-images/base-image/Dockerfile                     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infra/base-images/base-clang/checkout_build_install_llvm.sh b/infra/base-images/base-clang/checkout_build_install_llvm.sh
index f6e8ca99c8cc..ce8991fd2432 100755
--- a/infra/base-images/base-clang/checkout_build_install_llvm.sh
+++ b/infra/base-images/base-clang/checkout_build_install_llvm.sh
@@ -21,7 +21,7 @@
 NPROC=$(expr $(nproc) / 2)
 
 # zlib1g-dev is needed for llvm-profdata to handle coverage data from rust compiler
-LLVM_DEP_PACKAGES="build-essential make cmake ninja-build git python3 g++-multilib binutils-dev zlib1g-dev"
+LLVM_DEP_PACKAGES="build-essential make cmake ninja-build git python3 python3-distutils g++-multilib binutils-dev zlib1g-dev"
 apt-get install -y $LLVM_DEP_PACKAGES --no-install-recommends
 
 # Checkout
diff --git a/infra/base-images/base-image/Dockerfile b/infra/base-images/base-image/Dockerfile
index 2099ffdd2f0f..bc6035b7276b 100644
--- a/infra/base-images/base-image/Dockerfile
+++ b/infra/base-images/base-image/Dockerfile
@@ -16,11 +16,11 @@
 
 # Base image for all other images.
 
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get update && \
     apt-get upgrade -y && \
-    apt-get install -y libc6-dev binutils libgcc-5-dev && \
+    apt-get install -y libc6-dev binutils libgcc-9-dev && \
     apt-get autoremove -y
 
 ENV OUT=/out