Skip to content

Commit

Permalink
[Ubuntu upgrade] Upgrade images to Ubuntu 20.04 (#6305)
Browse files Browse the repository at this point in the history
Related: #6180.
  • Loading branch information
jonathanmetzman authored Aug 26, 2021
1 parent b3630ab commit 7ca0037
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions infra/base-images/base-image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7ca0037

Please sign in to comment.