Skip to content

Commit 34253ad

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "centos: do not install CentOS Rabbitmq repo twice on AArch64"
2 parents b73d4d1 + 0380740 commit 34253ad

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

docker/base/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,6 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
228228
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
229229
'influxdb',
230230
] %}
231-
{% elif base_arch == 'aarch64' %}
232-
{% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [
233-
'centos-release-rabbitmq-38'
234-
] %}
235231
{% endif %}
236232

237233
RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }}

0 commit comments

Comments
 (0)