Skip to content

Commit 91a598e

Browse files
committed
Bump to Erlang 24 and enable JIT compilation
See docker-library/rabbitmq#492 Co-authored-by: Michal Kuratczyk <[email protected]> Ensure compilation and runtime Erlang are in sync Bump to Ubuntu 20.04 docker-library/rabbitmq also uses Ubuntu 20.04
1 parent d8c4c0a commit 91a598e

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/workflows/oci.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,28 @@ jobs:
2121
- name: Checkout
2222
uses: actions/[email protected]
2323

24-
# RabbitMQ master requires Erlang 23 (correct at Mar 2021)
24+
# RabbitMQ master supports Erlang 24 (correct at June 2021)
2525
# Source of truth for released versions: https://www.rabbitmq.com/which-erlang.html
2626
#
2727
# For Elixir: https://github.com/rabbitmq/rabbitmq-server/blob/master/deps/rabbitmq_cli/mix.exs#L14
28-
- name: Set up min required Erlang & Elixir
28+
- name: Set up max supported Erlang & Elixir
2929
uses: erlef/[email protected]
3030
with:
31-
otp-version: '23.2'
32-
elixir-version: '1.11.4'
31+
otp-version: '24.0.2'
32+
elixir-version: '1.12.1'
3333

3434
- name: Build generic unix package
3535
run: |
3636
make package-generic-unix PROJECT_VERSION=${GITHUB_SHA}
3737
3838
- name: Build container image
3939
working-directory: packaging/docker-image
40-
run: |
41-
make dist IMAGE_TAG=${GITHUB_REF##*/} SKIP_PGP_VERIFY=true
40+
run: >-
41+
make dist
42+
IMAGE_TAG=${GITHUB_REF##*/}
43+
SKIP_PGP_VERIFY=true
44+
OTP_VERSION=24.0.2
45+
OTP_SHA256=4abca2cda7fc962ad65575e5ed834dd69c745e7e637f92cfd49f384a281d0f18
4246
4347
- name: Login to DockerHub
4448
working-directory: packaging/docker-image

packaging/docker-image/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The official Canonical Ubuntu Bionic image is ideal from a security perspective,
22
# especially for the enterprises that we, the RabbitMQ team, have to deal with
3-
FROM ubuntu:18.04
3+
FROM ubuntu:20.04
44

55
RUN set -eux; \
66
apt-get update; \
@@ -50,6 +50,7 @@ RUN set -eux; \
5050
ca-certificates \
5151
dpkg-dev \
5252
gcc \
53+
g++ \
5354
gnupg \
5455
libncurses5-dev \
5556
make \
@@ -127,6 +128,7 @@ RUN set -eux; \
127128
--disable-hipe \
128129
--disable-sctp \
129130
--disable-silent-rules \
131+
--enable-jit \
130132
--enable-clock-gettime \
131133
--enable-hybrid-heap \
132134
--enable-kernel-poll \

packaging/docker-image/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ $(error Cannot determine version; please specify VERSION)
3232
endif
3333
endif
3434

35-
OTP_VERSION ?= 23.2.4
36-
OTP_SHA256 ?= e72aa084907e0f34f932cf00caa33aba93147b0a7c9c35569d6bd1c402f532de
35+
OTP_VERSION ?= 24.0.2
36+
OTP_SHA256 ?= 4abca2cda7fc962ad65575e5ed834dd69c745e7e637f92cfd49f384a281d0f18
3737
REPO ?= pivotalrabbitmq/rabbitmq
3838
SKIP_PGP_VERIFY ?= false
3939
PGP_KEYSERVER ?= pgpkeys.eu

0 commit comments

Comments
 (0)