From 1dd7f1bc243405f2b9b4a88861701feb4437aaa8 Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Sat, 24 Jul 2021 13:19:44 +0000
Subject: [PATCH] tools: docker: focal: update to using gcc-10

---
 tools/docker/focal/Dockerfile | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tools/docker/focal/Dockerfile b/tools/docker/focal/Dockerfile
index dd7a6aafeb..34d691d5f8 100644
--- a/tools/docker/focal/Dockerfile
+++ b/tools/docker/focal/Dockerfile
@@ -18,13 +18,17 @@ RUN adduser --disabled-password --gecos '' docker \
  && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 
 RUN apt-get update && apt-get install -y \
-    wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip unzip diffutils lzop make file \
-    g++ xfonts-utils xsltproc default-jre-headless python3 \
-    libc6-dev libncurses5-dev \
-    libjson-perl libxml-parser-perl libparse-yapp-perl \
-    golang-go \
-    git openssh-client \
+    wget bash bc gcc-10 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
+      unzip diffutils lzop make file g++-10 xfonts-utils xsltproc default-jre-headless python3 \
+      libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl \
+      golang-go git openssh-client \
     --no-install-recommends \
  && rm -rf /var/lib/apt/lists/*
 
+RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
+    --slave /usr/bin/cpp cpp /usr/bin/cpp-10 \
+    --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+    --slave /usr/bin/gcov gcov /usr/bin/gcov-10
+RUN update-alternatives --config gcc
+
 USER docker