From 224224e3fc0af1201cff4e8db57390b1adc07fec Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 4 Jun 2023 05:01:04 +0000 Subject: [PATCH] tools/docker: jammy: update to using gcc-12 --- tools/docker/jammy/Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/docker/jammy/Dockerfile b/tools/docker/jammy/Dockerfile index 38554071af..e03055dd41 100644 --- a/tools/docker/jammy/Dockerfile +++ b/tools/docker/jammy/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-12 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ + unzip diffutils lzop make file g++-12 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-12 100 \ + --slave /usr/bin/cpp cpp /usr/bin/cpp-12 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-12 \ + --slave /usr/bin/gcov gcov /usr/bin/gcov-12 +RUN update-alternatives --config gcc + USER docker