From 456397107362af71c722abf731e057ff637e608b Mon Sep 17 00:00:00 2001
From: Radosław Piliszek <radoslaw.piliszek@gmail.com>
Date: Sat, 25 Sep 2021 19:41:22 +0000
Subject: Move all distros to upstream MariaDB 10.5

Per meeting's agreement [1].

[1] https://meetings.opendev.org/meetings/kolla/2021/kolla.2021-09-22-15.01.log.html#l-71

Change-Id: If24c53b3b89eddfaf2cad39fb9e70cea0f770c96
---
 docker/base/Dockerfile.j2        | 4 ++++
 docker/base/mariadb-aarch64.repo | 6 ++++++
 docker/base/mariadb.repo         | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 docker/base/mariadb-aarch64.repo
 create mode 100644 docker/base/mariadb.repo

(limited to 'docker/base')

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index ac43f0538..6e5823bf8 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
-- 
cgit v1.2.3