diff options
| author | Philip Kuryloski <kuryloskip@vmware.com> | 2022-05-17 14:07:16 +0200 |
|---|---|---|
| committer | Philip Kuryloski <kuryloskip@vmware.com> | 2022-06-08 14:04:53 +0200 |
| commit | 327f075d57d5184187e4bd9edba9ae9835d162c9 (patch) | |
| tree | 839e90f7259ef43d64129c2b534050b762a90211 /packaging | |
| parent | f0b0a4f90870d8d54190580094345484ca019532 (diff) | |
| download | rabbitmq-server-git-327f075d57d5184187e4bd9edba9ae9835d162c9.tar.gz | |
Make rabbitmq-server work with rules_erlang 3
Also rework elixir dependency handling, so we no longer rely on mix to
fetch the rabbitmq_cli deps
Also:
- Specify ra version with a commit rather than a branch
- Fixup compilation options for erlang 23
- Add missing ra reference in MODULE.bazel
- Add missing flag in oci.yaml
- Reduce bazel rbe jobs to try to save memory
- Use bazel built erlang for erlang git master tests
- Use the same cache for all the workflows but windows
- Avoid using `mix local.hex --force` in elixir rules
- Fetching seems blocked in CI, and this should reduce hex api usage in
all builds, which is always nice
- Remove xref and dialyze tags since rules_erlang 3 includes them in
the defaults
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/docker-image/Dockerfile | 18 | ||||
| -rw-r--r-- | packaging/docker-image/otp-versions/otp-max.yaml | 6 | ||||
| -rw-r--r-- | packaging/docker-image/otp-versions/otp-min.yaml | 12 | ||||
| -rw-r--r-- | packaging/docker-image/otp-versions/otp-rc.yaml | 3 |
4 files changed, 23 insertions, 16 deletions
diff --git a/packaging/docker-image/Dockerfile b/packaging/docker-image/Dockerfile index b31b90470b..af326dd539 100644 --- a/packaging/docker-image/Dockerfile +++ b/packaging/docker-image/Dockerfile @@ -3,11 +3,21 @@ FROM ubuntu:20.04 RUN set -eux; \ - apt-get update; \ - apt-get install -y --no-install-recommends \ + apt-get update; \ + apt-get install -y lsb-release ubuntu-dbgsym-keyring; \ + echo "deb http://ddebs.ubuntu.com $(lsb_release -cs) main restricted universe multiverse" > /etc/apt/sources.list.d/ddebs.list; \ + echo "deb http://ddebs.ubuntu.com $(lsb_release -cs)-updates main restricted universe multiverse" >> /etc/apt/sources.list.d/ddebs.list; \ + echo "deb http://ddebs.ubuntu.com $(lsb_release -cs)-proposed main restricted universe multiverse" >> /etc/apt/sources.list.d/ddebs.list; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ # grab gosu for easy step-down from root - gosu \ - ; \ + gosu \ + libc6-dbg \ + libgcc-s1-dbgsym \ + libstdc++6-dbgsym \ + libtinfo6-dbgsym \ + zlib1g-dbgsym \ + ; \ rm -rf /var/lib/apt/lists/*; \ # verify that the "gosu" binary works gosu nobody true diff --git a/packaging/docker-image/otp-versions/otp-max.yaml b/packaging/docker-image/otp-versions/otp-max.yaml index fd79f7dd74..74f279570e 100644 --- a/packaging/docker-image/otp-versions/otp-max.yaml +++ b/packaging/docker-image/otp-versions/otp-max.yaml @@ -1,7 +1,7 @@ -otp: '24.3.4' -otp_major: '24' +otp: '25.0' +otp_major: '25' # make -C packaging/docker-image find-otp-sha256 OTP_VERSION_MATCH=24.0 -otp_sha256: e59bedbb871af52244ca5284fd0a572d52128abd4decf4347fe2aef047b65c58 +otp_sha256: 5988e3bca208486494446e885ca2149fe487ee115cbc3770535fd22a795af5d2 # Which is the max supported Elixir? # https://github.com/rabbitmq/rabbitmq-server/blob/master/deps/rabbitmq_cli/mix.exs#L14 # Which is the latest Elixir release? diff --git a/packaging/docker-image/otp-versions/otp-min.yaml b/packaging/docker-image/otp-versions/otp-min.yaml index 13d6099b3b..acfec5d561 100644 --- a/packaging/docker-image/otp-versions/otp-min.yaml +++ b/packaging/docker-image/otp-versions/otp-min.yaml @@ -1,7 +1,7 @@ -otp: '23.2' -otp_major: '23' -# make -C packaging/docker-image find-otp-sha256 OTP_VERSION_MATCH=23.2 -otp_sha256: 79f2233a960cc427607d52a7b7e9e5b08afba96a4d87ced4efb64e902b44160c -# Which is the min supported Elixir? +otp: '24.3.4' +otp_major: '24' +# make -C packaging/docker-image find-otp-sha256 OTP_VERSION_MATCH=24.0 +otp_sha256: e59bedbb871af52244ca5284fd0a572d52128abd4decf4347fe2aef047b65c58 +# Which is the max supported Elixir? # https://github.com/rabbitmq/rabbitmq-server/blob/master/deps/rabbitmq_cli/mix.exs#L14 -elixir: '1.12.3'
\ No newline at end of file +elixir: '1.12.3' diff --git a/packaging/docker-image/otp-versions/otp-rc.yaml b/packaging/docker-image/otp-versions/otp-rc.yaml deleted file mode 100644 index e9afb95b22..0000000000 --- a/packaging/docker-image/otp-versions/otp-rc.yaml +++ /dev/null @@ -1,3 +0,0 @@ -otp: '25.0-rc3' -otp_major: '25' -elixir: '1.13.4' |
