Remove focal (EOL)
https://lists.ubuntu.com/archives/ubuntu-announce/2025-May/000312.html
This commit is contained in:
parent
a3cb572e53
commit
68bf121a88
|
|
@ -14,7 +14,6 @@ RUN set -eux; \
|
|||
"bullseye", # 0.24
|
||||
# https://packages.ubuntu.com/sq
|
||||
"jammy", # 0.25
|
||||
"focal", # no sq
|
||||
empty # trailing comma
|
||||
) then "" else ( -}}
|
||||
sq \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ FROM buildpack-deps:{{ env.codename }}-curl
|
|||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
{{ if env.codename | IN("focal", "groovy") then ( -}}
|
||||
{{ if env.codename | IN("groovy") then ( -}}
|
||||
bzr \
|
||||
{{ ) else "" end -}}
|
||||
git \
|
||||
|
|
|
|||
|
|
@ -93,10 +93,6 @@ for version; do
|
|||
variantAliases=( "${variantAliases[@]//latest-/}" )
|
||||
|
||||
variantArches="$arches"
|
||||
if [ "$version" = 'ubuntu/focal' ] && [ "$variant" != 'curl' ]; then
|
||||
# focal on riscv64 doesn't have mercurial, so we just exclude the upper focal variants from riscv64 entirely
|
||||
variantArches="$(sed -r -e 's/ riscv64 / /g' <<<" $variantArches ")"
|
||||
fi
|
||||
|
||||
echo
|
||||
cat <<-EOE
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ def apt_get_dist_clean:
|
|||
# https://launchpad.net/ubuntu/+source/apt
|
||||
# https://packages.ubuntu.com/apt
|
||||
"jammy",
|
||||
"focal",
|
||||
|
||||
empty
|
||||
) then
|
||||
|
|
|
|||
|
|
@ -1,54 +0,0 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM buildpack-deps:focal-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/*
|
||||
|
|
@ -1,20 +0,0 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM ubuntu:focal
|
||||
|
||||
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/*
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#
|
||||
# NOTE: THIS DOCKERFILE IS GENERATED VIA "apply-templates.sh"
|
||||
#
|
||||
# PLEASE DO NOT EDIT IT DIRECTLY.
|
||||
#
|
||||
|
||||
FROM buildpack-deps:focal-curl
|
||||
|
||||
RUN set -eux; \
|
||||
apt-get update; \
|
||||
apt-get install -y --no-install-recommends \
|
||||
bzr \
|
||||
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/*
|
||||
|
|
@ -31,14 +31,6 @@
|
|||
""
|
||||
]
|
||||
},
|
||||
"ubuntu/focal": {
|
||||
"suite": "20.04",
|
||||
"variants": [
|
||||
"curl",
|
||||
"scm",
|
||||
""
|
||||
]
|
||||
},
|
||||
"ubuntu/jammy": {
|
||||
"suite": "22.04",
|
||||
"variants": [
|
||||
|
|
|
|||
Loading…
Reference in New Issue