From 848a36ff82a5b0d014842a9e7a1a2c3df0f90931 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 12 Jun 2021 08:08:33 +0000 Subject: [PATCH 1/2] Dockerfiles: add zstd to docker dependencies Signed-off-by: Ian Leonard --- tools/docker/bionic/Dockerfile | 2 +- tools/docker/buster/Dockerfile | 2 +- tools/docker/focal/Dockerfile | 2 +- tools/docker/groovy/Dockerfile | 2 +- tools/docker/hirsute/Dockerfile | 2 +- tools/docker/sid/Dockerfile | 2 +- tools/docker/stretch/Dockerfile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/docker/bionic/Dockerfile b/tools/docker/bionic/Dockerfile index 0c31451a0f..3ccaed3520 100644 --- a/tools/docker/bionic/Dockerfile +++ b/tools/docker/bionic/Dockerfile @@ -18,7 +18,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ diff --git a/tools/docker/buster/Dockerfile b/tools/docker/buster/Dockerfile index bc1a2932cb..08941776c1 100644 --- a/tools/docker/buster/Dockerfile +++ b/tools/docker/buster/Dockerfile @@ -19,7 +19,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ diff --git a/tools/docker/focal/Dockerfile b/tools/docker/focal/Dockerfile index b6150078ea..dd7a6aafeb 100644 --- a/tools/docker/focal/Dockerfile +++ b/tools/docker/focal/Dockerfile @@ -18,7 +18,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ diff --git a/tools/docker/groovy/Dockerfile b/tools/docker/groovy/Dockerfile index c2bf556dbf..6fc1ebe936 100644 --- a/tools/docker/groovy/Dockerfile +++ b/tools/docker/groovy/Dockerfile @@ -18,7 +18,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ diff --git a/tools/docker/hirsute/Dockerfile b/tools/docker/hirsute/Dockerfile index f821339c2d..8773020ad3 100644 --- a/tools/docker/hirsute/Dockerfile +++ b/tools/docker/hirsute/Dockerfile @@ -18,7 +18,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ diff --git a/tools/docker/sid/Dockerfile b/tools/docker/sid/Dockerfile index ad739d4af9..93f6e6151c 100644 --- a/tools/docker/sid/Dockerfile +++ b/tools/docker/sid/Dockerfile @@ -19,7 +19,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ diff --git a/tools/docker/stretch/Dockerfile b/tools/docker/stretch/Dockerfile index 74259b33f9..3ee6d7cf52 100644 --- a/tools/docker/stretch/Dockerfile +++ b/tools/docker/stretch/Dockerfile @@ -19,7 +19,7 @@ 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 perl gawk gperf zip unzip diffutils lzop make file \ + 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 \ From 1dd7f1bc243405f2b9b4a88861701feb4437aaa8 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 24 Jul 2021 13:19:44 +0000 Subject: [PATCH 2/2] 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