diff options
| author | Zuul <zuul@review.opendev.org> | 2021-10-04 10:00:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-10-04 10:00:50 +0000 |
| commit | 26e468ba4033a8b82dfde9866301d9bc6efb2a9c (patch) | |
| tree | a514fb8a48af4eb37467f158ceee3165d67acddb /docker/base | |
| parent | c729bc21e87e0fa55563b36d714db595104b45ac (diff) | |
| parent | 456397107362af71c722abf731e057ff637e608b (diff) | |
| download | kolla-26e468ba4033a8b82dfde9866301d9bc6efb2a9c.tar.gz kolla-26e468ba4033a8b82dfde9866301d9bc6efb2a9c.zip | |
Merge "Move all distros to upstream MariaDB 10.5"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/mariadb-aarch64.repo | 6 | ||||
| -rw-r--r-- | docker/base/mariadb.repo | 6 |
3 files changed, 16 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', ] %} diff --git a/docker/base/mariadb-aarch64.repo b/docker/base/mariadb-aarch64.repo new file mode 100644 index 000000000..7f7a1c8b1 --- /dev/null +++ b/docker/base/mariadb-aarch64.repo @@ -0,0 +1,6 @@ +[mariadb] +name = MariaDB +baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-aarch64 +module_hotfixes = 1 +gpgcheck = 1 +enabled = 0 diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo new file mode 100644 index 000000000..9fbdd12ee --- /dev/null +++ b/docker/base/mariadb.repo @@ -0,0 +1,6 @@ +[mariadb] +name = MariaDB +baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-amd64 +module_hotfixes = 1 +gpgcheck = 1 +enabled = 0 |