File tree Expand file tree Collapse file tree 7 files changed +7
-224
lines changed Expand file tree Collapse file tree 7 files changed +7
-224
lines changed Original file line number Diff line number Diff line change @@ -42,11 +42,11 @@ apt-get update && apt-get install --no-install-recommends -y lsb-release
4242SCRIPTPATH=" $( 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)'
4747echo " 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...
5050if [ ! -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
Original file line number Diff line number Diff 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} \
Original file line number Diff line number Diff 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
5353XPLAT_BASE=" debian-bullseye"
5454XPLAT_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)
Load Diff This file was deleted.
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -6,12 +6,9 @@ DOCKER_ORG="apache"
66KEEP_IMAGES=(
77couchdbci-debian:bullseye-erlang-25.3.2.12
88couchdbci-debian:bullseye-erlang-26.2.5
9- couchdbci-debian:buster-erlang-24.3.4.17
109couchdbci-debian:bullseye-erlang-24.3.4.17
1110couchdbci-centos:9-erlang-24.3.4.17
1211couchdbci-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
1512couchdbci-ubuntu:jammy-erlang-24.3.4.17
1613couchdbci-ubuntu:focal-erlang-24.3.4.17
1714)
You can’t perform that action at this time.
0 commit comments