From 9fe786bd1582c993bf8d227a7f21f7a4af559978 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 22 Oct 2022 02:28:57 +0000 Subject: [PATCH 1/5] tools/docker: update readme --- tools/docker/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/README.md b/tools/docker/README.md index dd1dbe99fc..fea946830f 100644 --- a/tools/docker/README.md +++ b/tools/docker/README.md @@ -4,8 +4,8 @@ - Ubuntu - bionic (Ubuntu 18.04) - focal (Ubuntu 20.04) - - groovy (Ubuntu 20.10) - - hirsute (Ubuntu 21.04) + - jammy (Ubuntu 22.04) + - kinetic (Ubuntu 22.10) - Debian - stretch (Debian 9.0) - buster (Debian 10.0) From 2d3aaabd9a729baf8a5889fb450696abaca22ec4 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 22 Oct 2022 02:29:55 +0000 Subject: [PATCH 2/5] tools/docker: drop groovy container as it is EOL --- tools/docker/groovy/Dockerfile | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 tools/docker/groovy/Dockerfile diff --git a/tools/docker/groovy/Dockerfile b/tools/docker/groovy/Dockerfile deleted file mode 100644 index 6fc1ebe936..0000000000 --- a/tools/docker/groovy/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM ubuntu:groovy - -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 \ - golang-go \ - git openssh-client \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* - -USER docker From 03cd4101ad6d1652f237210d95ebce6e6f4cd739 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 22 Oct 2022 02:30:31 +0000 Subject: [PATCH 3/5] tools/docker: drop hirsute container as it is EOL --- tools/docker/hirsute/Dockerfile | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 tools/docker/hirsute/Dockerfile diff --git a/tools/docker/hirsute/Dockerfile b/tools/docker/hirsute/Dockerfile deleted file mode 100644 index 8773020ad3..0000000000 --- a/tools/docker/hirsute/Dockerfile +++ /dev/null @@ -1,30 +0,0 @@ -FROM ubuntu:hirsute - -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 \ - golang-go \ - git openssh-client \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* - -USER docker From 4580feb6daf411c254d98b45859dcdfbc1cee3ad Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 22 Oct 2022 02:31:30 +0000 Subject: [PATCH 4/5] tools/docker: add kinetic container --- tools/docker/kinetic/Dockerfile | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tools/docker/kinetic/Dockerfile diff --git a/tools/docker/kinetic/Dockerfile b/tools/docker/kinetic/Dockerfile new file mode 100644 index 0000000000..5d15869eb5 --- /dev/null +++ b/tools/docker/kinetic/Dockerfile @@ -0,0 +1,30 @@ +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 \ + golang-go \ + git openssh-client \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* + +USER docker From a6bc1549f7789b58c535b7e6dd3c7a8863806edc Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 22 Oct 2022 02:31:13 +0000 Subject: [PATCH 5/5] tools/docker: add jammy container --- tools/docker/jammy/Dockerfile | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tools/docker/jammy/Dockerfile diff --git a/tools/docker/jammy/Dockerfile b/tools/docker/jammy/Dockerfile new file mode 100644 index 0000000000..38554071af --- /dev/null +++ b/tools/docker/jammy/Dockerfile @@ -0,0 +1,30 @@ +FROM ubuntu:jammy + +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 \ + golang-go \ + git openssh-client \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* + +USER docker