From c3ca375afd41c3b495fae43b00721f92b4da832e Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 13 Nov 2023 11:59:26 +0000
Subject: [PATCH] tools/docker: drop end of support stretch, bionic

---
 tools/docker/README.md          |  2 --
 tools/docker/bionic/Dockerfile  | 30 ------------------------------
 tools/docker/stretch/Dockerfile | 31 -------------------------------
 3 files changed, 63 deletions(-)
 delete mode 100644 tools/docker/bionic/Dockerfile
 delete mode 100644 tools/docker/stretch/Dockerfile

diff --git a/tools/docker/README.md b/tools/docker/README.md
index 5b96dd0e8d..5fb66c55e1 100644
--- a/tools/docker/README.md
+++ b/tools/docker/README.md
@@ -2,13 +2,11 @@
 
 **Docker containers**
 - Ubuntu
-  - bionic  (Ubuntu 18.04)
   - focal   (Ubuntu 20.04)
   - jammy   (Ubuntu 22.04)
   - kinetic (Ubuntu 22.10)
   - lunar   (Ubuntu 23.04)
 - Debian
-  - stretch (Debian  9.0)
   - buster  (Debian 10.0)
   - sid     (Debian unstable)
 
diff --git a/tools/docker/bionic/Dockerfile b/tools/docker/bionic/Dockerfile
deleted file mode 100644
index 3ccaed3520..0000000000
--- a/tools/docker/bionic/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM ubuntu:bionic
-
-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
diff --git a/tools/docker/stretch/Dockerfile b/tools/docker/stretch/Dockerfile
deleted file mode 100644
index 3ee6d7cf52..0000000000
--- a/tools/docker/stretch/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-FROM debian:stretch
-
-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 echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen \
- && 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