Skip to content

Remove buster, bionic and centos 7 #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 11, 2024
Merged

Remove buster, bionic and centos 7 #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions bin/apt-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ apt-get update && apt-get install --no-install-recommends -y lsb-release
SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
. ${SCRIPTPATH}/detect-arch.sh >/dev/null
. ${SCRIPTPATH}/detect-os.sh >/dev/null
debians='(buster|bullseye|bookworm)'
ubuntus='(bionic|focal|jammy)'
debians='(bullseye|bookworm)'
ubuntus='(focal|jammy)'
echo "Detected Ubuntu/Debian version: ${VERSION_CODENAME} arch: ${ARCH}"

# bionic Docker image seems to be missing /etc/timezone...
# ubuntu docker image seems to be missing /etc/timezone...
if [ ! -f /etc/timezone ]; then
rm -f /etc/localtime
ln -snf /usr/share/zoneinfo/Etc/UTC /etc/localtime
Expand Down Expand Up @@ -157,9 +157,6 @@ if [ "$1" != "nojs" ]; then
apt-get install --no-install-recommends -y couch-libmozjs185-dev
fi
# newer releases have newer libmozjs
if [ "${VERSION_CODENAME}" == "buster" ]; then
apt-get install --no-install-recommends -y libmozjs-60-dev
fi
if [ "${VERSION_CODENAME}" == "focal" ]; then
apt-get install --no-install-recommends -y libmozjs-68-dev
fi
Expand Down
1 change: 0 additions & 1 deletion bin/install-dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ case "${OSTYPE}" in
linux*)
redhats='(rhel|centos|fedora|almalinux)'
debians='(debian|ubuntu)'
latest='(stretch|buster|bionic)'

if [[ ${ID} =~ ${redhats} ]]; then
NODEVERSION=${NODEVERSION} \
Expand Down
15 changes: 4 additions & 11 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# When updating the images, consider updating pull-all-couchdbdev-docker
# script as well
#
DEBIANS="debian-buster debian-bullseye debian-bookworm"
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
CENTOSES="centos-7 almalinux-8 almalinux-9"
DEBIANS="debian-bullseye debian-bookworm"
UBUNTUS="ubuntu-focal ubuntu-jammy"
CENTOSES="almalinux-8 almalinux-9"

XPLAT_BASE="debian-bullseye"
XPLAT_ARCHES="arm64v8 ppc64le s390x"
Expand Down Expand Up @@ -159,14 +159,7 @@ case "$1" in
# For all platforms
shift
for plat in $DEBIANS $UBUNTUS $CENTOSES; do
# Some platforms only get x86_64 builds
if [ "${plat}" == "debian-buster" ] || \
[ "${plat}" == "ubuntu-bionic" ] || \
[ "${plat}" == "centos-7" ]; then
BUILDX_PLATFORMS=linux/amd64 buildx-platform $plat
else
buildx-platform $plat
fi
buildx-platform $plat
done
;;
couch)
Expand Down
69 changes: 0 additions & 69 deletions dockerfiles/centos-7
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions dockerfiles/debian-buster
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions dockerfiles/ubuntu-bionic
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions pull-all-couchdbdev-docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@ DOCKER_ORG="apache"
KEEP_IMAGES=(
couchdbci-debian:bullseye-erlang-25.3.2.12
couchdbci-debian:bullseye-erlang-26.2.5
couchdbci-debian:buster-erlang-24.3.4.17
couchdbci-debian:bullseye-erlang-24.3.4.17
couchdbci-centos:9-erlang-24.3.4.17
couchdbci-centos:8-erlang-24.3.4.17
couchdbci-centos:7-erlang-24.3.4.17
couchdbci-ubuntu:bionic-erlang-24.3.4.17
couchdbci-ubuntu:jammy-erlang-24.3.4.17
couchdbci-ubuntu:focal-erlang-24.3.4.17
)
Expand Down