aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-10-18 15:53:54 +0000
committerGerrit Code Review <review@openstack.org>2022-10-18 15:53:54 +0000
commit4a90585634c91ac78c8443b98578e8721db786f4 (patch)
treeabfb22acede9b47d2036c0d9a172e2d14a12f05b /docker/base/Dockerfile.j2
parentd8188d05e68492f1722ae40e42308c451d1ede1b (diff)
parente104ef7fdcf0faf48a8f70b73a67103258004924 (diff)
downloadkolla-4a90585634c91ac78c8443b98578e8721db786f4.tar.gz
kolla-4a90585634c91ac78c8443b98578e8721db786f4.zip
Merge "rabbitmq/aarch64: use COPR for Erlang"
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j27
1 files changed, 1 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 3dbf49770..09b01dc61 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -98,11 +98,8 @@ SHA1 keys are not supported in RHEL9: https://github.com/rpm-software-management
# 'crmsh.repo',
{% elif base_arch == 'aarch64' %}
-{#
-Repo files not available for CentOS Stream 9:
- 'erlang-solutions.repo',
- #}
{% set base_yum_repo_files = base_yum_repo_files + [
+ 'hrw-copr-erlang-for-rabbitmq.repo',
] %}
{#
@@ -159,7 +156,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
'centos-release-ceph-quincy',
'centos-release-nfv-openvswitch',
'centos-release-opstools',
- 'centos-release-rabbitmq-38',
'epel-release',
] %}
@@ -177,7 +173,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \
'centos-ceph-quincy',
'centos-nfv-openvswitch',
'centos-opstools',
- 'centos-rabbitmq-38',
'centos9-nfv-ovs',
'centos9-opstools',
'centos9-rabbitmq',