From e6c3ed02a3538c37df168f34aa81c6676c38bfdd Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 1 Jul 2024 14:27:02 -0700 Subject: [PATCH] Remove (now EOL) Debian Buster variants --- Dockerfile-curl.template | 1 - debian/buster/Dockerfile | 54 ----------------------------------- debian/buster/curl/Dockerfile | 18 ------------ debian/buster/scm/Dockerfile | 20 ------------- shared.jq | 1 - versions.json | 8 ------ 6 files changed, 102 deletions(-) delete mode 100644 debian/buster/Dockerfile delete mode 100644 debian/buster/curl/Dockerfile delete mode 100644 debian/buster/scm/Dockerfile diff --git a/Dockerfile-curl.template b/Dockerfile-curl.template index 3c4a46f7..6163c6da 100644 --- a/Dockerfile-curl.template +++ b/Dockerfile-curl.template @@ -12,7 +12,6 @@ RUN set -eux; \ # we want versions of "sq" that contain https://gitlab.com/sequoia-pgp/sequoia/-/commit/b41e1504cd29097328cb21f95808c9972188499e (and thus "sq keyserver" subcommands; 0.26+) # https://packages.debian.org/sq "bullseye", # 0.24 - "buster", # no sq # https://packages.ubuntu.com/sq "mantic", # no sq "jammy", # 0.25 diff --git a/debian/buster/Dockerfile b/debian/buster/Dockerfile deleted file mode 100644 index 7f6ea0e0..00000000 --- a/debian/buster/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:buster-scm - -RUN set -ex; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - autoconf \ - automake \ - bzip2 \ - default-libmysqlclient-dev \ - dpkg-dev \ - file \ - g++ \ - gcc \ - imagemagick \ - libbz2-dev \ - libc6-dev \ - libcurl4-openssl-dev \ - libdb-dev \ - libevent-dev \ - libffi-dev \ - libgdbm-dev \ - libglib2.0-dev \ - libgmp-dev \ - libjpeg-dev \ - libkrb5-dev \ - liblzma-dev \ - libmagickcore-dev \ - libmagickwand-dev \ - libmaxminddb-dev \ - libncurses5-dev \ - libncursesw5-dev \ - libpng-dev \ - libpq-dev \ - libreadline-dev \ - libsqlite3-dev \ - libssl-dev \ - libtool \ - libwebp-dev \ - libxml2-dev \ - libxslt-dev \ - libyaml-dev \ - make \ - patch \ - unzip \ - xz-utils \ - zlib1g-dev \ - ; \ - rm -rf /var/lib/apt/lists/* diff --git a/debian/buster/curl/Dockerfile b/debian/buster/curl/Dockerfile deleted file mode 100644 index ace86395..00000000 --- a/debian/buster/curl/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM debian:buster - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - gnupg \ - netbase \ - wget \ - ; \ - rm -rf /var/lib/apt/lists/* diff --git a/debian/buster/scm/Dockerfile b/debian/buster/scm/Dockerfile deleted file mode 100644 index 43eccdba..00000000 --- a/debian/buster/scm/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM buildpack-deps:buster-curl - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - git \ - mercurial \ - openssh-client \ - subversion \ - \ -# procps is very common in build systems, and is a reasonably small package - procps \ - ; \ - rm -rf /var/lib/apt/lists/* diff --git a/shared.jq b/shared.jq index 6de2169d..825c00b1 100644 --- a/shared.jq +++ b/shared.jq @@ -7,7 +7,6 @@ def apt_get_dist_clean: # https://packages.debian.org/apt "bookworm", "bullseye", - "buster", # https://launchpad.net/ubuntu/+source/apt # https://packages.ubuntu.com/apt diff --git a/versions.json b/versions.json index 72648657..f5e75851 100644 --- a/versions.json +++ b/versions.json @@ -15,14 +15,6 @@ "" ] }, - "debian/buster": { - "suite": "oldoldstable", - "variants": [ - "curl", - "scm", - "" - ] - }, "debian/sid": { "suite": "unstable", "variants": [