apache · nickva · Jul 12, 2024 · Jul 11, 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.15.7 ERLANGVERSION=25.3.2.12 ./build.sh platform debian-bullseye
+NODEVERSION=18 ELIXIRVERSION=v1.17.2 ERLANGVERSION=25.3.2.13 ./build.sh platform debian-bullseye
 ```
 
 ## Building images for other architectures
@@ -71,7 +71,7 @@ will build **and upload** a new multi-arch container image to the registry. For
 example:
 
 ```
-./build.sh buildx-platform debian-bullseye
+./build.sh buildx-platform debian-bookworm
 ```
 
 The `$BUILDX_PLATFORMS` environment variable can be used to override the default
@@ -90,7 +90,7 @@ This will build all the Debian and RHEL-clone OS images on x86-64 with that vers
 ## Update images used for CI with new Erlang versions
 
 ```
-ERLANGVERSION=24.3.4.7 ./build.sh buildx-platform debian-bullseye
+ERLANGVERSION=24.3.4.7 ./build.sh buildx-platform debian-bookworm
 ```
 
 This will update Debian Bullseye OS image for all architectures (x86,
@@ -105,7 +105,7 @@ buildx-platform-release creates as x86 only.
 ## Update Debian Bullseye image with 25.2
 
 ```
-BUILDX_PLATFORMS=linux/amd64 ERLANGVERSION=25.2 ./build.sh buildx-platform debian-bullseye
+BUILDX_PLATFORMS=linux/amd64 ERLANGVERSION=25.2 ./build.sh buildx-platform debian-bookworm
 ```
 
 In this case, since we're not using 25.2 for multi-arch testing, opt to build it only for x86.
@@ -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-bullseye-erlang-23.3.4.17`.
+where `<tag>` is of the format `<distro>-<version>-<type>`, such as `debian-bookworm-erlang-25.3.2.13`.
 
 ## Running the CouchDB build in a published container
 

diff --git a/bin/install-dependencies.sh b/bin/install-dependencies.sh
@@ -30,8 +30,8 @@ set -e
 
 # Defaults updated 2023-03-20
 NODEVERSION=${NODEVERSION:-18}
-ERLANGVERSION=${ERLANGVERSION:-25.3.2.12}
-ELIXIRVERSION=${ELIXIRVERSION:-v1.15.7}
+ERLANGVERSION=${ERLANGVERSION:-25.3.2.13}
+ELIXIRVERSION=${ELIXIRVERSION:-v1.17.2}
 
 
 # This works if we're not called through a symlink

diff --git a/bin/install-elixir.sh b/bin/install-elixir.sh
@@ -28,7 +28,7 @@
 set -e
 
 
-ELIXIR_VSN=${ELIXIRVERSION:-v1.15.7}
+ELIXIR_VSN=${ELIXIRVERSION:-v1.17.2}
 ERLANG_VSN=`erl -noshell -eval 'io:fwrite(erlang:system_info(otp_release)), halt().'`
 # See https://github.com/hexpm/bob
 URL=https://repo.hex.pm/builds/elixir/${ELIXIR_VSN}-otp-${ERLANG_VSN}.zip

diff --git a/bin/source-erlang.sh b/bin/source-erlang.sh
@@ -80,12 +80,24 @@ else
     DISABLE_JIT=""
 fi
 
+if [[ ${ERLANGMAJORVERSION} -gt 25 ]]; then
+    echo "*************************  WARNING ***************************"
+    echo "As of 2024-07-11 Erlang 26.2.5* fails access any crypto functions"
+    echo "on OSes with OpenSSL 3.0.x (Debian Bookworm, at least) if the "
+    echo "--enable-fips flag is enabled. See: github.com/erlang/otp/issues/8562"
+    echo "**************************************************************"
+    ENABLE_FIPS=""
+else
+    ENABLE_FIPS="--enable-fips"
+fi
+
 # Configure Erlang - skip building things we don't want or need
-./configure --without-javac --without-wx --without-odbc \
-  --without-debugger --without-observer --without-et  --without-cosEvent \
-  --without-cosEventDomain --without-cosFileTransfer \
-  --without-cosNotification --without-cosProperty --without-cosTime \
-  --without-cosTransactions --without-orber --enable-fips ${DISABLE_JIT}
+./configure \
+  --without-javac --without-wx --without-odbc \
+  --without-debugger --without-observer --without-et  \
+  --without-diameter --without-megaco --without-tftp \
+  --without-ftp \
+  ${ENABLE_FIPS} ${DISABLE_JIT}
 
 make -j $(nproc)
 make install

diff --git a/dockerfiles/almalinux-8 b/dockerfiles/almalinux-8
@@ -34,8 +34,8 @@ 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.12
-ARG elixirversion=v1.15.7
+ARG erlangversion=25.3.2.13
+ARG elixirversion=v1.17.2
 ARG nodeversion=18
 
 # Create Jenkins user and group

diff --git a/dockerfiles/almalinux-9 b/dockerfiles/almalinux-9
@@ -34,8 +34,8 @@ 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.12
-ARG elixirversion=v1.15.7
+ARG erlangversion=25.3.2.13
+ARG elixirversion=v1.17.2
 ARG nodeversion=18
 
 # Create Jenkins user and group

diff --git a/dockerfiles/debian-bookworm b/dockerfiles/debian-bookworm
@@ -36,8 +36,8 @@ 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.12
-ARG elixirversion=v1.15.7
+ARG erlangversion=25.3.2.13
+ARG elixirversion=v1.17.2
 ARG nodeversion=18
 
 # Create Jenkins user and group

diff --git a/dockerfiles/debian-bullseye b/dockerfiles/debian-bullseye
@@ -36,8 +36,8 @@ 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.12
-ARG elixirversion=v1.15.7
+ARG erlangversion=25.3.2.13
+ARG elixirversion=v1.17.2
 ARG nodeversion=18
 
 # Create Jenkins user and group

diff --git a/dockerfiles/ubuntu-focal b/dockerfiles/ubuntu-focal
@@ -34,8 +34,8 @@ 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.12
-ARG elixirversion=v1.15.7
+ARG erlangversion=25.3.2.13
+ARG elixirversion=v1.17.2
 ARG nodeversion=18
 
 # Create Jenkins user and group

diff --git a/dockerfiles/ubuntu-jammy b/dockerfiles/ubuntu-jammy
@@ -34,8 +34,8 @@ 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.12
-ARG elixirversion=v1.15.7
+ARG erlangversion=25.3.2.13
+ARG elixirversion=v1.17.2
 ARG nodeversion=18
 
 # Create Jenkins user and group

diff --git a/pull-all-couchdbdev-docker b/pull-all-couchdbdev-docker
@@ -4,12 +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: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
+couchdbci-debian:bookworm-erlang-25.3.2.13
+couchdbci-debian:bookworm-erlang-26.2.5.2
+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
 )
 
 for image in ${KEEP_IMAGES[*]}