diff options
| author | Zuul <zuul@review.opendev.org> | 2022-02-08 08:37:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-02-08 08:37:57 +0000 |
| commit | c0be6b1265c53b1ca113e8c39b6cd6b1c829069e (patch) | |
| tree | bc5db16c6c9fa7a77e590e9b9a660da2470fdc54 /docker/base | |
| parent | 2553c1845c7c4cf04d720b820e4bb13519eca4c9 (diff) | |
| parent | f943c7d773a280b832dde9edf9d615540b259b5c (diff) | |
| download | kolla-c0be6b1265c53b1ca113e8c39b6cd6b1c829069e.tar.gz kolla-c0be6b1265c53b1ca113e8c39b6cd6b1c829069e.zip | |
Merge "erlang: use packages from Erlang Solutions on AArch64"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/erlang-solutions.repo | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 7867d6e11..43a7858e4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -99,10 +99,12 @@ COPY dnf.conf /etc/dnf/dnf.conf ] %} {% elif base_arch == 'aarch64' %} {% set base_yum_repo_files = base_yum_repo_files + [ + 'erlang-solutions.repo', 'mariadb-aarch64.repo', ] %} {% set base_yum_repo_keys = base_yum_repo_keys + [ + 'https://packages.erlang-solutions.com/rpm/erlang_solutions.asc', ] %} {% endif %} @@ -155,7 +157,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-release-nfv-extras', 'centos-release-nfv-openvswitch', 'centos-release-opstools', - 'centos-release-rabbitmq-38', 'epel-release', ] %} @@ -176,7 +177,6 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ 'centos-ceph-pacific', 'centos-nfv-openvswitch', 'centos-opstools', - 'centos-rabbitmq-38', 'epel', 'epel-modular', ] %} diff --git a/docker/base/erlang-solutions.repo b/docker/base/erlang-solutions.repo new file mode 100644 index 000000000..4adbe680f --- /dev/null +++ b/docker/base/erlang-solutions.repo @@ -0,0 +1,6 @@ +[erlang-solutions] +name=erlang-solutions +baseurl=https://packages.erlang-solutions.com/rpm/centos/$releasever/$basearch +gpgcheck=1 +gpgkey=https://packages.erlang-solutions.com/rpm/erlang_solutions.asc +enabled=0 |