Skip to content

Commit b504258

Browse files
committed
Update node, elixir and improve building
* Most node versions are now at 18, except a few which needed to be held back. * Elixir is at 1.15 * Building is now a single command per erlang version: ```sh ERLANGVERSION=24.3.4.14 ./build.sh buildx-platform-release ```
1 parent 0065863 commit b504258

File tree

13 files changed

+28
-20
lines changed

13 files changed

+28
-20
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ On the other hand, some OSes won't run older Erlangs because of library changes,
4949
Just specify on the command line any of the `ERLANGVERSION`, `NODEVERSION`, or `ELIXIRVERSION` environment variables:
5050

5151
```
52-
NODEVERSION=14 ELIXIRVERSION=v1.14.5 ERLANGVERSION=24.3.4.7 ./build.sh platform debian-jessie
52+
NODEVERSION=18 ELIXIRVERSION=v1.15.7 ERLANGVERSION=24.3.4.7 ./build.sh platform debian-bullseye
5353
```
5454

5555
## Building images for other architectures

bin/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set -e
3131
# Defaults updated 2023-03-20
3232
NODEVERSION=${NODEVERSION:-14}
3333
ERLANGVERSION=${ERLANGVERSION:-24.3.4.14}
34-
ELIXIRVERSION=${ELIXIRVERSION:-v1.14.5}
34+
ELIXIRVERSION=${ELIXIRVERSION:-v1.15.7}
3535

3636

3737
# This works if we're not called through a symlink

bin/install-elixir.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
set -e
2929

3030

31-
ELIXIR_VSN=${ELIXIRVERSION:-v1.14.5}
31+
ELIXIR_VSN=${ELIXIRVERSION:-v1.15.7}
3232
ERLANG_VSN=`erl -noshell -eval 'io:fwrite(erlang:system_info(otp_release)), halt().'`
3333
# See https://github.com/hexpm/bob
3434
URL=https://repo.hex.pm/builds/elixir/${ELIXIR_VSN}-otp-${ERLANG_VSN}.zip

build.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4949
DEBIANS="debian-buster debian-bullseye debian-bookworm"
5050
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
5151
CENTOSES="centos-7 almalinux-8 almalinux-9"
52+
5253
XPLAT_BASE="debian-bullseye"
5354
XPLAT_ARCHES="arm64v8 ppc64le s390x"
5455
PASSED_BUILDARGS="$buildargs"
@@ -158,7 +159,14 @@ case "$1" in
158159
# For all platforms
159160
shift
160161
for plat in $DEBIANS $UBUNTUS $CENTOSES; do
161-
BUILDX_PLATFORMS=linux/amd64 buildx-platform $plat
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
162170
done
163171
;;
164172
couch)

dockerfiles/almalinux-8

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ARG js=js
3030
ARG erlang=erlang
3131
# Select version of Node, Erlang and Elixir to install
3232
ARG erlangversion=24.3.4.14
33-
ARG elixirversion=v1.14.5
34-
ARG nodeversion=14
33+
ARG elixirversion=v1.15.7
34+
ARG nodeversion=18
3535

3636
# Create Jenkins user and group
3737
RUN groupadd --gid 910 jenkins; \

dockerfiles/almalinux-9

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ ARG js=js
3030
ARG erlang=erlang
3131
# Select version of Node, Erlang and Elixir to install
3232
ARG erlangversion=24.3.4.14
33-
ARG elixirversion=v1.14.5
34-
ARG nodeversion=14
33+
ARG elixirversion=v1.15.7
34+
ARG nodeversion=18
3535

3636
# Create Jenkins user and group
3737
RUN groupadd --gid 910 jenkins; \

dockerfiles/centos-7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG js=js
3030
ARG erlang=erlang
3131
# Select version of Node, Erlang and Elixir to install
3232
ARG erlangversion=24.3.4.14
33-
ARG elixirversion=v1.14.5
33+
ARG elixirversion=v1.15.7
3434
ARG nodeversion=14
3535

3636
# Create Jenkins user and group

dockerfiles/debian-bookworm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ARG erlang=erlang
3333
# Select version of Node, Erlang and Elixir
3434
ARG erlangversion=24.3.4.14
3535
ARG elixirversion=v1.15.7
36-
ARG nodeversion=14
36+
ARG nodeversion=18
3737

3838
# Create Jenkins user and group
3939
RUN groupadd --gid 910 jenkins; \

dockerfiles/debian-bullseye

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ARG js=js
3232
ARG erlang=erlang
3333
# Select version of Node, Erlang and Elixir
3434
ARG erlangversion=24.3.4.14
35-
ARG elixirversion=v1.14.5
36-
ARG nodeversion=14
35+
ARG elixirversion=v1.15.7
36+
ARG nodeversion=18
3737

3838
# Create Jenkins user and group
3939
RUN groupadd --gid 910 jenkins; \

dockerfiles/debian-buster

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ ARG js=js
3232
ARG erlang=erlang
3333
# Select version of Node, Erlang and Elixir
3434
ARG erlangversion=24.3.4.14
35-
ARG elixirversion=v1.14.5
36-
ARG nodeversion=14
35+
ARG elixirversion=v1.15.7
36+
ARG nodeversion=18
3737

3838
# Create Jenkins user and group
3939
RUN groupadd --gid 910 jenkins; \

0 commit comments

Comments
 (0)