From b2c86fd3addcbc1451fd9f580445315833fabf72 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 23 Jun 2020 09:32:38 +0000 Subject: CentOS/AArch64: RabbitMQ is back! CentOS 8.2 has Erlang and RabbitMQ available in 'messaging/rabbitmq-38' repository. We use it to grab Erlang while RabbitMQ comes from upstream (like on x86-64). Change-Id: I2559267d120081f2e5eabc9d966b019517a5ad5d --- docker/base/Dockerfile.j2 | 5 ++++- docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo (limited to 'docker/base') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index fd2ced890..e080be8a9 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -106,7 +106,6 @@ RUN {{ macros.install_packages(base_centos_language_packages | customizable("cen {% set base_yum_repo_files = [ 'grafana.repo', 'rabbitmq_rabbitmq-server.repo', - 'rabbitmq_rabbitmq-erlang-aarch64.repo', ] %} # FIXME(mgoddard): Not available for CentOS 8 yet. # @@ -219,6 +218,10 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [ 'influxdb', ] %} +{% elif base_arch == 'aarch64' %} + {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ + 'centos-release-rabbitmq-38' + ] %} {% endif %} RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} diff --git a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo b/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo deleted file mode 100644 index 2d6b5b073..000000000 --- a/docker/base/rabbitmq_rabbitmq-erlang-aarch64.repo +++ /dev/null @@ -1,6 +0,0 @@ -[rabbitmq_rabbitmq-erlang] -name=rabbitmq_rabbitmq-erlang -baseurl=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/ -gpgcheck=1 -enabled=0 -gpgkey=http://obs.linaro.org/home:/marcin.juszkiewicz/centos$releasever/repodata/repomd.xml.key -- cgit v1.2.3