diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-28 11:34:57 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-05-08 08:57:31 +0000 |
| commit | 038074097727340e7a507a4693af0794797a849d (patch) | |
| tree | 2a672393ab21fa2ca0a1ac968e49e60b771b47a5 | |
| parent | 6dfae74813289575e77aaa7dfe43f7e6a81a5f26 (diff) | |
| download | kolla-038074097727340e7a507a4693af0794797a849d.tar.gz kolla-038074097727340e7a507a4693af0794797a849d.zip | |
centos: do not install CentOS Rabbitmq repo twice on AArch64
Change-Id: I320d0795ce11ca00398cec6183ed140d31d3fd80
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 839dae24a..5ec3d2de3 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -228,10 +228,6 @@ 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) }} |