From def73501b6251a8397ddbc49826f3625fc61d0a3 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 16 Jan 2024 09:14:02 +0000 Subject: [PATCH 1/2] tools/docker: add noble container --- tools/docker/noble/Dockerfile | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tools/docker/noble/Dockerfile diff --git a/tools/docker/noble/Dockerfile b/tools/docker/noble/Dockerfile new file mode 100644 index 0000000000..144196d7b3 --- /dev/null +++ b/tools/docker/noble/Dockerfile @@ -0,0 +1,45 @@ +FROM ubuntu:noble + +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get dist-upgrade -y \ + && apt-get install -y locales sudo + +RUN locale-gen en_US.UTF-8 \ + && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en +ENV LANG=en_US.UTF-8 \ + LANGUAGE=en_US:en \ + LC_ALL=en_US.UTF-8 + +RUN useradd docker -U -G sudo -m -s /bin/bash \ + && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +RUN apt-get update + +RUN apt-get install -y \ + wget bash bc gcc-13 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ + unzip diffutils lzop make file g++-13 xfonts-utils xsltproc default-jre-headless python3 \ + libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ + golang-go git openssh-client \ + --no-install-recommends + +RUN if [ "$(uname -m)" = "aarch64" ]; then \ + echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \ + echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ + echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ + echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ + apt-get update; \ + dpkg --add-architecture amd64; \ + apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \ + fi + +RUN rm -rf /var/lib/apt/lists/* + +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 \ + --slave /usr/bin/cpp cpp /usr/bin/cpp-13 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-13 \ + --slave /usr/bin/gcov gcov /usr/bin/gcov-13 +RUN update-alternatives --config gcc + +USER docker From 37b4f16b21be5ff923ec892f49ad53214ac09994 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 17 Jan 2024 10:07:27 +0000 Subject: [PATCH 2/2] tools/docker: drop EoL Dockerfiles --- tools/docker/README.md | 3 +-- tools/docker/kinetic/Dockerfile | 28 ---------------------------- tools/docker/lunar/Dockerfile | 28 ---------------------------- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 tools/docker/kinetic/Dockerfile delete mode 100644 tools/docker/lunar/Dockerfile diff --git a/tools/docker/README.md b/tools/docker/README.md index 5fb66c55e1..2c1f648117 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -4,8 +4,7 @@ - Ubuntu - focal (Ubuntu 20.04) - jammy (Ubuntu 22.04) - - kinetic (Ubuntu 22.10) - - lunar (Ubuntu 23.04) + - noble (Ubuntu 24.04) - Debian - buster (Debian 10.0) - sid (Debian unstable) diff --git a/tools/docker/kinetic/Dockerfile b/tools/docker/kinetic/Dockerfile deleted file mode 100644 index 0628842df8..0000000000 --- a/tools/docker/kinetic/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM ubuntu:kinetic - -ARG DEBIAN_FRONTEND=noninteractive - -RUN apt-get update \ - && apt-get dist-upgrade -y \ - && apt-get install -y locales sudo \ - && rm -rf /var/lib/apt/lists/* - -RUN locale-gen en_US.UTF-8 \ - && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en -ENV LANG=en_US.UTF-8 \ - LANGUAGE=en_US:en \ - LC_ALL=en_US.UTF-8 - -RUN adduser --disabled-password --gecos '' docker \ - && adduser docker sudo \ - && 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 rdfind \ - golang-go git openssh-client \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* - -USER docker diff --git a/tools/docker/lunar/Dockerfile b/tools/docker/lunar/Dockerfile deleted file mode 100644 index 42aa59bb2b..0000000000 --- a/tools/docker/lunar/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -FROM ubuntu:lunar - -ARG DEBIAN_FRONTEND=noninteractive - -RUN apt-get update \ - && apt-get dist-upgrade -y \ - && apt-get install -y adduser locales sudo \ - && rm -rf /var/lib/apt/lists/* - -RUN locale-gen en_US.UTF-8 \ - && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US:en -ENV LANG=en_US.UTF-8 \ - LANGUAGE=en_US:en \ - LC_ALL=en_US.UTF-8 - -RUN adduser --disabled-password --gecos '' docker \ - && adduser docker sudo \ - && 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 rdfind \ - golang-go git openssh-client \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* - -USER docker