Update Erlang 25 and bookworm for pull request CI

nickva · nickva · commit 5dc1ab5dc88e · 2024-06-06T12:07:59.000-04:00
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ On the other hand, some OSes won't run older Erlangs because of library changes,
 Just specify on the command line any of the `ERLANGVERSION`, `NODEVERSION`, or `ELIXIRVERSION` environment variables:
 
 ```
-NODEVERSION=18 ELIXIRVERSION=v1.15.7 ERLANGVERSION=24.3.4.17 ./build.sh platform debian-bullseye
+NODEVERSION=18 ELIXIRVERSION=v1.15.7 ERLANGVERSION=25.3.2.12 ./build.sh platform debian-bullseye
 ```
 
 ## Building images for other architectures
diff --git a/bin/install-dependencies.sh b/bin/install-dependencies.sh
@@ -29,8 +29,8 @@
 set -e
 
 # Defaults updated 2023-03-20
-NODEVERSION=${NODEVERSION:-14}
-ERLANGVERSION=${ERLANGVERSION:-24.3.4.17}
+NODEVERSION=${NODEVERSION:-18}
+ERLANGVERSION=${ERLANGVERSION:-25.3.2.12}
 ELIXIRVERSION=${ELIXIRVERSION:-v1.15.7}
 
 
diff --git a/build.sh b/build.sh
@@ -50,7 +50,7 @@ DEBIANS="debian-bullseye debian-bookworm"
 UBUNTUS="ubuntu-focal ubuntu-jammy"
 CENTOSES="almalinux-8 almalinux-9"
 
-XPLAT_BASE="debian-bullseye"
+XPLAT_BASE="debian-bookworm"
 XPLAT_ARCHES="arm64v8 ppc64le s390x"
 PASSED_BUILDARGS="$buildargs"
 
diff --git a/dockerfiles/almalinux-8 b/dockerfiles/almalinux-8
@@ -34,7 +34,7 @@ ARG js=js
 # Choose whether to install Erlang, default yes
 ARG erlang=erlang
 # Select version of Node, Erlang and Elixir to install
-ARG erlangversion=24.3.4.17
+ARG erlangversion=25.3.2.12
 ARG elixirversion=v1.15.7
 ARG nodeversion=18
 
diff --git a/dockerfiles/almalinux-9 b/dockerfiles/almalinux-9
@@ -34,7 +34,7 @@ ARG js=js
 # Choose whether to install Erlang, default yes
 ARG erlang=erlang
 # Select version of Node, Erlang and Elixir to install
-ARG erlangversion=24.3.4.17
+ARG erlangversion=25.3.2.12
 ARG elixirversion=v1.15.7
 ARG nodeversion=18
 
diff --git a/dockerfiles/debian-bookworm b/dockerfiles/debian-bookworm
@@ -36,7 +36,7 @@ ARG js=js
 # Choose whether to install Erlang, default yes
 ARG erlang=erlang
 # Select version of Node, Erlang and Elixir
-ARG erlangversion=24.3.4.17
+ARG erlangversion=25.3.2.12
 ARG elixirversion=v1.15.7
 ARG nodeversion=18
 
diff --git a/dockerfiles/debian-bullseye b/dockerfiles/debian-bullseye
@@ -36,7 +36,7 @@ ARG js=js
 # Choose whether to install Erlang, default yes
 ARG erlang=erlang
 # Select version of Node, Erlang and Elixir
-ARG erlangversion=24.3.4.17
+ARG erlangversion=25.3.2.12
 ARG elixirversion=v1.15.7
 ARG nodeversion=18
 
diff --git a/dockerfiles/ubuntu-focal b/dockerfiles/ubuntu-focal
@@ -34,7 +34,7 @@ ARG js=js
 # Choose whether to install Erlang, default yes
 ARG erlang=erlang
 # Select version of Node, Erlang and Elixir to install
-ARG erlangversion=24.3.4.17
+ARG erlangversion=25.3.2.12
 ARG elixirversion=v1.15.7
 ARG nodeversion=18
 
diff --git a/dockerfiles/ubuntu-jammy b/dockerfiles/ubuntu-jammy
@@ -34,7 +34,7 @@ ARG js=js
 # Choose whether to install Erlang, default yes
 ARG erlang=erlang
 # Select version of Node, Erlang and Elixir to install
-ARG erlangversion=24.3.4.17
+ARG erlangversion=25.3.2.12
 ARG elixirversion=v1.15.7
 ARG nodeversion=18
 
diff --git a/pull-all-couchdbdev-docker b/pull-all-couchdbdev-docker
@@ -4,13 +4,12 @@ DOCKER_ORG="apache"
 
 # These are the images that are currently being used, so don't `docker rmi` them on cleanup.
 KEEP_IMAGES=(
-couchdbci-debian:bullseye-erlang-25.3.2.12
-couchdbci-debian:bullseye-erlang-26.2.5
-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-ubuntu:jammy-erlang-24.3.4.17
-couchdbci-ubuntu:focal-erlang-24.3.4.17
+couchdbci-debian:bookworm-erlang-25.3.2.12
+couchdbci-debian:bookworm-erlang-26.2.5
+couchdbci-centos:9-erlang-25.3.2.12
+couchdbci-centos:8-erlang-25.3.2.12
+couchdbci-ubuntu:jammy-erlang-25.3.2.12
+couchdbci-ubuntu:focal-erlang-25.3.2.12
 )
 
 for image in ${KEEP_IMAGES[*]}
