Skip to content

Commit 0192a91

Browse files
authored
Use Ubuntu 22.04 for RabbitMQ 3.12.x (#644)
Continues to use Ubuntu 20.04 for 3.11, 3.10 and 3.9 Fixes #643 Use Ubuntu 22.04 as the base image Bump OpenSSL to 3.1.x series, use Ubuntu 22.04
1 parent 8b63fea commit 0192a91

File tree

12 files changed

+91
-41
lines changed

12 files changed

+91
-41
lines changed

3.10/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.10/ubuntu/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.11/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.11/ubuntu/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.12/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.12/ubuntu/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.9/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

3.9/ubuntu/Dockerfile

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-alpine.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk!
2-
FROM alpine:3.18 as build-base
2+
FROM alpine:{{ .alpine.version }} as build-base
33

44
RUN apk add --no-cache \
55
build-base \
@@ -191,7 +191,7 @@ RUN set -eux; \
191191
# Check that Erlang/OTP crypto & ssl were compiled against OpenSSL correctly
192192
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
193193

194-
FROM alpine:3.18
194+
FROM alpine:{{ .alpine.version }}
195195

196196
COPY --from=erlang-builder /usr/local/bin/ /usr/local/bin/
197197
COPY --from=erlang-builder /usr/local/etc/ssl/ /usr/local/etc/ssl/

Dockerfile-ubuntu.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# The official Canonical Ubuntu Focal image is ideal from a security perspective,
22
# especially for the enterprises that we, the RabbitMQ team, have to deal with
3-
FROM ubuntu:20.04 as build-base
3+
FROM ubuntu:{{ .ubuntu.version }} as build-base
44

55
RUN set -eux; \
66
apt-get update; \
@@ -191,7 +191,7 @@ RUN set -eux; \
191191
# Check that Erlang/OTP crypto & ssl were compiled against OpenSSL correctly
192192
RUN erl -noshell -eval 'ok = crypto:start(), ok = io:format("~p~n~n~p~n~n", [crypto:supports(), ssl:versions()]), init:stop().'
193193

194-
FROM ubuntu:20.04
194+
FROM ubuntu:{{ .ubuntu.version }}
195195

196196
COPY --from=erlang-builder /usr/local/bin/ /usr/local/bin/
197197
COPY --from=erlang-builder /usr/local/etc/ssl/ /usr/local/etc/ssl/

0 commit comments

Comments
 (0)