Browse Source

rabbitmq: Move to packagecloud

bintray is being shut down 1st of May 2021, rabbitmq docs direct
users to packagecloud - so let's move.

For Victoria and below, includes I6a3ba599af3deedd450b4ffff6b86a0c04628340
(base: drop Linaro OBS key for CentOS and Ubuntu)

For Train, fixes also the order of rpm gpg key imports and
yum operations (otherwise CentOS 8 [with dnf] fails because repos
are enabled early and keys are missing).
And it also pins erlang version where required.

Change-Id: I499251d13ca77aea2215f8a879b7bb8dd51f1c9f
(cherry picked from commit 641b936bc7)
changes/85/787985/6
Michal Nasiadka 2 months ago
committed by Radosław Piliszek
parent
commit
c9b0e2ae40
9 changed files with 21 additions and 23 deletions
  1. +8
    -6
      docker/base/Dockerfile.j2
  2. +1
    -2
      docker/base/rabbitmq_rabbitmq-erlang.repo
  3. +1
    -9
      docker/base/rabbitmq_rabbitmq-server.repo
  4. +1
    -0
      docker/kolla-toolbox/Dockerfile.j2
  5. +1
    -0
      docker/rabbitmq-3.7.24/Dockerfile.j2
  6. +1
    -3
      docker/rabbitmq-3.7.24/rabbitmq_rabbitmq-erlang.repo
  7. +1
    -3
      docker/rabbitmq-3.7.24/rabbitmq_rabbitmq-server.repo
  8. +1
    -0
      docker/rabbitmq/Dockerfile.j2
  9. +6
    -0
      releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml

+ 8
- 6
docker/base/Dockerfile.j2 View File

@ -100,6 +100,7 @@ COPY yum.conf /etc/yum.conf
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
@ -122,6 +123,7 @@ COPY yum.conf /etc/yum.conf
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
] %}
# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
@ -166,6 +168,12 @@ RUN if [[ -e /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo ]]; then \
{% block base_centos_repo_overrides_post_copy %}{% endblock %}
{% for key in base_yum_repo_keys | customizable('yum_repo_keys') %}
{%- if loop.first %}RUN {% else %} && {% endif -%}
rpm --import {{ key }}
{%- if not loop.last %} \{% endif %}
{% endfor -%}
# Install what is needed for en_US.UTF-8
{% block base_centos_distro_sync_and_languages %}
@ -185,12 +193,6 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen
{{ macros.install_packages(base_yum_url_packages | customizable("yum_url_packages")) }}
{% for key in base_yum_repo_keys | customizable('yum_repo_keys') %}
{%- if loop.first %}RUN {% else %} && {% endif -%}
rpm --import {{ key }}
{%- if not loop.last %} \{% endif %}
{% endfor -%}
{% if install_metatype in ['rdo', 'mixed'] %}
{% for cmd in rpm_setup %}


+ 1
- 2
docker/base/rabbitmq_rabbitmq-erlang.repo View File

@ -1,6 +1,5 @@
[rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang
baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
baseurl=https://packagecloud.io/rabbitmq/erlang/el/$releasever/$basearch
gpgcheck=1
enabled=1
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc

+ 1
- 9
docker/base/rabbitmq_rabbitmq-server.repo View File

@ -1,13 +1,5 @@
[rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/$releasever/$basearch
# NOTE(mgoddard): rabbitmq-server 3.7 packages are not signed. Previously
# repo_gpgcheck was set to 1, but this breaks DNF which does not seem to accept
# keys imported by rpm --import for signing a repo (as opposed to packages).
# TODO(mgoddard): Set gpgcheck=1 for rabbitmq-server 3.8+
gpgcheck=0
gpgcheck=1
enabled=1
gpgkey=https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey
sslverify=1
sslcacert=/etc/pki/tls/certs/ca-bundle.crt
metadata_expire=300

+ 1
- 0
docker/kolla-toolbox/Dockerfile.j2 View File

@ -31,6 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% if distro_package_manager == 'dnf' %}
{% set kolla_toolbox_packages = kolla_toolbox_packages + [
'erlang-22.*',
'python3-devel',
'rabbitmq-server-3.7.*'
] %}


+ 1
- 0
docker/rabbitmq-3.7.24/Dockerfile.j2 View File

@ -10,6 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% block rabbitmq_install %}
{% if base_package_type == 'rpm' %}
{% set rabbitmq_packages = [
'erlang-22.*',
'hostname',
'rabbitmq-server-3.7.24',
] %}


+ 1
- 3
docker/rabbitmq-3.7.24/rabbitmq_rabbitmq-erlang.repo View File

@ -1,7 +1,5 @@
[rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang
baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
repo_gpgcheck=1
baseurl=https://packagecloud.io/rabbitmq/erlang/el/$releasever/$basearch
gpgcheck=1
enabled=1
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc

+ 1
- 3
docker/rabbitmq-3.7.24/rabbitmq_rabbitmq-server.repo View File

@ -1,7 +1,5 @@
[rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server
baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.7.x/el/$releasever/
repo_gpgcheck=1
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/$releasever/$basearch
gpgcheck=1
enabled=1
gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc

+ 1
- 0
docker/rabbitmq/Dockerfile.j2 View File

@ -14,6 +14,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% if distro_package_manager == 'dnf' %}
{% set rabbitmq_packages = rabbitmq_packages + [
'erlang-22.*',
'rabbitmq-server-3.7.*'
] %}
{% else %}


+ 6
- 0
releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml View File

@ -0,0 +1,6 @@
---
upgrade:
- |
RabbitMQ and Erlang packages are now installed from ``packagecloud.io``
(and PPA for Ubuntu) since ``bintray.com`` is getting shut down
May 1st, 2021.

Loading…
Cancel
Save