diff --git a/Dockerfile-curl.template b/Dockerfile-curl.template index 6163c6da..986aa99a 100644 --- a/Dockerfile-curl.template +++ b/Dockerfile-curl.template @@ -13,7 +13,6 @@ RUN set -eux; \ # https://packages.debian.org/sq "bullseye", # 0.24 # https://packages.ubuntu.com/sq - "mantic", # no sq "jammy", # 0.25 "focal", # no sq empty # trailing comma diff --git a/shared.jq b/shared.jq index 825c00b1..1a82889a 100644 --- a/shared.jq +++ b/shared.jq @@ -10,7 +10,6 @@ def apt_get_dist_clean: # https://launchpad.net/ubuntu/+source/apt # https://packages.ubuntu.com/apt - "mantic", "jammy", "focal", diff --git a/ubuntu/mantic/Dockerfile b/ubuntu/mantic/Dockerfile deleted file mode 100644 index da7dcefb..00000000 --- a/ubuntu/mantic/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:mantic-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/ubuntu/mantic/curl/Dockerfile b/ubuntu/mantic/curl/Dockerfile deleted file mode 100644 index 6b75df32..00000000 --- a/ubuntu/mantic/curl/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -# -# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh" -# -# PLEASE DO NOT EDIT IT DIRECTLY. -# - -FROM ubuntu:mantic - -RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ - ca-certificates \ - curl \ - gnupg \ - netbase \ - wget \ -# https://bugs.debian.org/929417 - tzdata \ - ; \ - rm -rf /var/lib/apt/lists/* diff --git a/ubuntu/mantic/scm/Dockerfile b/ubuntu/mantic/scm/Dockerfile deleted file mode 100644 index 24d7a22e..00000000 --- a/ubuntu/mantic/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:mantic-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/versions.json b/versions.json index f5e75851..ec6ce352 100644 --- a/versions.json +++ b/versions.json @@ -47,14 +47,6 @@ "" ] }, - "ubuntu/mantic": { - "suite": "23.10", - "variants": [ - "curl", - "scm", - "" - ] - }, "ubuntu/noble": { "suite": "24.04", "variants": [