aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-10-04 10:00:50 +0000
committerGerrit Code Review <review@openstack.org>2021-10-04 10:00:50 +0000
commit26e468ba4033a8b82dfde9866301d9bc6efb2a9c (patch)
treea514fb8a48af4eb37467f158ceee3165d67acddb /docker/base/Dockerfile.j2
parentc729bc21e87e0fa55563b36d714db595104b45ac (diff)
parent456397107362af71c722abf731e057ff637e608b (diff)
downloadkolla-26e468ba4033a8b82dfde9866301d9bc6efb2a9c.tar.gz
kolla-26e468ba4033a8b82dfde9866301d9bc6efb2a9c.zip
Merge "Move all distros to upstream MariaDB 10.5"
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 8a49ce32f..b659ed580 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -76,6 +76,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
'elasticsearch.repo',
'grafana.repo',
'influxdb.repo',
+ 'mariadb.repo',
'proxysql.repo',
'rabbitmq_rabbitmq-server.repo',
'rabbitmq_rabbitmq-erlang.repo',
@@ -88,6 +89,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
'https://packages.grafana.com/gpg.key',
'https://repos.influxdata.com/influxdb.key',
+ 'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://packages.treasuredata.com/GPG-KEY-td-agent',
'https://repo.proxysql.com/ProxySQL/repo_pub_key',
@@ -96,6 +98,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% set base_yum_repo_files = [
'elasticsearch.repo',
'grafana.repo',
+ 'mariadb-aarch64.repo',
'proxysql.repo',
'rabbitmq_rabbitmq-server.repo',
'td.repo',
@@ -103,6 +106,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
{% set base_yum_repo_keys = [
'https://packages.grafana.com/gpg.key',
+ 'https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB',
'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
'https://repo.proxysql.com/ProxySQL/repo_pub_key',
] %}