Skip to content

Commit fd85b86

Browse files
committed
Remove buster, bionic and centos 7
Bionic support ended in April 2023 [1], and CentOS 7 and Buster [2] support is ending June 2024 [2][3]. We don't want to be distributuing potential unpatched security issues. [1] https://ubuntu.com/about/release-cycle [2] https://www.redhat.com/en/technologies/linux-platforms/enterprise-linux/centos-migration [3] https://wiki.debian.org/LTS/Buster
1 parent f1de45e commit fd85b86

File tree

7 files changed

+7
-224
lines changed

7 files changed

+7
-224
lines changed

bin/apt-dependencies.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ apt-get update && apt-get install --no-install-recommends -y lsb-release
4242
SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4343
. ${SCRIPTPATH}/detect-arch.sh >/dev/null
4444
. ${SCRIPTPATH}/detect-os.sh >/dev/null
45-
debians='(buster|bullseye|bookworm)'
46-
ubuntus='(bionic|focal|jammy)'
45+
debians='(bullseye|bookworm)'
46+
ubuntus='(focal|jammy)'
4747
echo "Detected Ubuntu/Debian version: ${VERSION_CODENAME} arch: ${ARCH}"
4848

49-
# bionic Docker image seems to be missing /etc/timezone...
49+
# ubuntu docker image seems to be missing /etc/timezone...
5050
if [ ! -f /etc/timezone ]; then
5151
rm -f /etc/localtime
5252
ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime
@@ -157,9 +157,6 @@ if [ "$1" != "nojs" ]; then
157157
apt-get install --no-install-recommends -y couch-libmozjs185-dev
158158
fi
159159
# newer releases have newer libmozjs
160-
if [ "${VERSION_CODENAME}" == "buster" ]; then
161-
apt-get install --no-install-recommends -y libmozjs-60-dev
162-
fi
163160
if [ "${VERSION_CODENAME}" == "focal" ]; then
164161
apt-get install --no-install-recommends -y libmozjs-68-dev
165162
fi

bin/install-dependencies.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ case "${OSTYPE}" in
8585
linux*)
8686
redhats='(rhel|centos|fedora|almalinux)'
8787
debians='(debian|ubuntu)'
88-
latest='(stretch|buster|bionic)'
8988

9089
if [[ ${ID} =~ ${redhats} ]]; then
9190
NODEVERSION=${NODEVERSION} \

build.sh

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4646
# When updating the images, consider updating pull-all-couchdbdev-docker
4747
# script as well
4848
#
49-
DEBIANS="debian-buster debian-bullseye debian-bookworm"
50-
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
51-
CENTOSES="centos-7 almalinux-8 almalinux-9"
49+
DEBIANS="debian-bullseye debian-bookworm"
50+
UBUNTUS="ubuntu-focal ubuntu-jammy"
51+
CENTOSES="almalinux-8 almalinux-9"
5252

5353
XPLAT_BASE="debian-bullseye"
5454
XPLAT_ARCHES="arm64v8 ppc64le s390x"
@@ -159,14 +159,7 @@ case "$1" in
159159
# For all platforms
160160
shift
161161
for plat in $DEBIANS $UBUNTUS $CENTOSES; do
162-
# Some platforms only get x86_64 builds
163-
if [ "${plat}" == "debian-buster" ] || \
164-
[ "${plat}" == "ubuntu-bionic" ] || \
165-
[ "${plat}" == "centos-7" ]; then
166-
BUILDX_PLATFORMS=linux/amd64 buildx-platform $plat
167-
else
168-
buildx-platform $plat
169-
fi
162+
buildx-platform $plat
170163
done
171164
;;
172165
couch)

dockerfiles/centos-7

Lines changed: 0 additions & 69 deletions
This file was deleted.

dockerfiles/debian-buster

Lines changed: 0 additions & 68 deletions
This file was deleted.

dockerfiles/ubuntu-bionic

Lines changed: 0 additions & 66 deletions
This file was deleted.

pull-all-couchdbdev-docker

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,9 @@ DOCKER_ORG="apache"
66
KEEP_IMAGES=(
77
couchdbci-debian:bullseye-erlang-25.3.2.12
88
couchdbci-debian:bullseye-erlang-26.2.5
9-
couchdbci-debian:buster-erlang-24.3.4.17
109
couchdbci-debian:bullseye-erlang-24.3.4.17
1110
couchdbci-centos:9-erlang-24.3.4.17
1211
couchdbci-centos:8-erlang-24.3.4.17
13-
couchdbci-centos:7-erlang-24.3.4.17
14-
couchdbci-ubuntu:bionic-erlang-24.3.4.17
1512
couchdbci-ubuntu:jammy-erlang-24.3.4.17
1613
couchdbci-ubuntu:focal-erlang-24.3.4.17
1714
)

0 commit comments

Comments
 (0)