apache · nickva · Oct 15, 2024 · Oct 14, 2024
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.17.2 ERLANGVERSION=25.3.2.13 ./build.sh platform debian-bullseye
+NODEVERSION=18 ELIXIRVERSION=v1.17.2 ERLANGVERSION=25.3.2.15 ./build.sh platform debian-bullseye
 ```
 
 ## Building images for other architectures
@@ -136,7 +136,7 @@ After building the image as above:
 docker run -it couchdbdev/<tag>
 ```
 
-where `<tag>` is of the format `<distro>-<version>-<type>`, such as `debian-bookworm-erlang-25.3.2.13`.
+where `<tag>` is of the format `<distro>-<version>-<type>`, such as `debian-bookworm-erlang-25.3.2.15`.
 
 ## Running the CouchDB build in a published container
 

diff --git a/bin/install-dependencies.sh b/bin/install-dependencies.sh
@@ -30,7 +30,7 @@ set -e
 
 # Defaults updated 2023-03-20
 NODEVERSION=${NODEVERSION:-18}
-ERLANGVERSION=${ERLANGVERSION:-25.3.2.13}
+ERLANGVERSION=${ERLANGVERSION:-25.3.2.15}
 ELIXIRVERSION=${ELIXIRVERSION:-v1.17.2}
 
 

diff --git a/build.sh b/build.sh
@@ -50,8 +50,6 @@ DEBIANS="debian-bullseye debian-bookworm"
 UBUNTUS="ubuntu-focal ubuntu-jammy"
 CENTOSES="almalinux-8 almalinux-9"
 
-XPLAT_BASE="debian-bookworm"
-XPLAT_ARCHES="arm64v8 ppc64le s390x"
 PASSED_BUILDARGS="$buildargs"
 
 #  Allow overriding this list from the command line
@@ -100,6 +98,16 @@ pull-os-image() {
   docker pull $image_name
 }
 
+set-platforms() {
+   if [ "$1" == "debian-bullseye" ]; then
+       # Debian LTSs apparently start dropping random arches with time
+       echo "!!! reducing list of arches for $1 !!!"
+       actual_buildx_platforms="linux/amd64,linux/arm64"
+   else
+       actual_buildx_platforms=${BUILDX_PLATFORMS}
+   fi
+}
+
 buildx-platform() {
   check-envs
   find-erlang-version $1
@@ -110,10 +118,11 @@ buildx-platform() {
   else
     repo="$os"
   fi
+  set-platforms $1
   docker buildx build -f dockerfiles/${os}-${version} \
       $buildargs \
       --no-cache \
-      --platform ${BUILDX_PLATFORMS} \
+      --platform ${actual_buildx_platforms} \
       --tag apache/couchdbci-${repo}:${version}-erlang-${ERLANGVERSION} \
       --push \
       ${SCRIPTPATH}

diff --git a/dockerfiles/almalinux-8 b/dockerfiles/almalinux-8
@@ -31,7 +31,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=25.3.2.13
+ARG erlangversion=25.3.2.15
 ARG elixirversion=v1.17.2
 ARG nodeversion=18
 

diff --git a/dockerfiles/almalinux-9 b/dockerfiles/almalinux-9
@@ -31,7 +31,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=25.3.2.13
+ARG erlangversion=25.3.2.15
 ARG elixirversion=v1.17.2
 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=25.3.2.13
+ARG erlangversion=25.3.2.15
 ARG elixirversion=v1.17.2
 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=25.3.2.13
+ARG erlangversion=25.3.2.15
 ARG elixirversion=v1.17.2
 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=25.3.2.13
+ARG erlangversion=25.3.2.15
 ARG elixirversion=v1.17.2
 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=25.3.2.13
+ARG erlangversion=25.3.2.15
 ARG elixirversion=v1.17.2
 ARG nodeversion=18
 

diff --git a/pull-all-couchdbdev-docker b/pull-all-couchdbdev-docker
@@ -4,13 +4,13 @@ DOCKER_ORG="apache"
 
 # These are the images that are currently being used, so don't `docker rmi` them on cleanup.
 KEEP_IMAGES=(
-couchdbci-debian:bookworm-erlang-25.3.2.13
+couchdbci-debian:bookworm-erlang-25.3.2.15
 couchdbci-debian:bookworm-erlang-26.2.5.4
 couchdbci-debian:bookworm-erlang:27.1.1
-couchdbci-centos:9-erlang-25.3.2.13
-couchdbci-centos:8-erlang-25.3.2.13
-couchdbci-ubuntu:jammy-erlang-25.3.2.13
-couchdbci-ubuntu:focal-erlang-25.3.2.13
+couchdbci-centos:9-erlang-25.3.2.15
+couchdbci-centos:8-erlang-25.3.2.15
+couchdbci-ubuntu:jammy-erlang-25.3.2.15
+couchdbci-ubuntu:focal-erlang-25.3.2.15
 )
 
 for image in ${KEEP_IMAGES[*]}