diff options
| author | Zuul <zuul@review.opendev.org> | 2023-06-29 10:37:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-06-29 10:37:09 +0000 |
| commit | 0fca84015ac9e7010a844fedce9d4f3e1b612b7e (patch) | |
| tree | 664dd87f09e2b74fa4f155e08f61c0ad30c92aca /docker | |
| parent | 5bf088263c17f687dac1f78c1546b833c44116c8 (diff) | |
| parent | 05f6fe8c30e6e737258a2d651334e27aa7b0f6c1 (diff) | |
| download | kolla-0fca84015ac9e7010a844fedce9d4f3e1b612b7e.tar.gz kolla-0fca84015ac9e7010a844fedce9d4f3e1b612b7e.zip | |
Merge "mariadb: Bump to current LTS (10.11)"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/mariadb.repo | 2 | ||||
| -rw-r--r-- | docker/mariadb/mariadb-base/Dockerfile.j2 | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/docker/base/mariadb.repo b/docker/base/mariadb.repo index 24489500f..07d97ef20 100644 --- a/docker/base/mariadb.repo +++ b/docker/base/mariadb.repo @@ -1,6 +1,6 @@ [mariadb] name = MariaDB Server -baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/$releasever/$basearch +baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch gpgcheck = 1 enabled = 0 module_hotfixes = 1 diff --git a/docker/mariadb/mariadb-base/Dockerfile.j2 b/docker/mariadb/mariadb-base/Dockerfile.j2 index 83b62e6d8..620211197 100644 --- a/docker/mariadb/mariadb-base/Dockerfile.j2 +++ b/docker/mariadb/mariadb-base/Dockerfile.j2 @@ -24,8 +24,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.install_packages(mariadb_base_packages | customizable("packages")) }} +{# NOTE(mnasiadka): Latest clustercheck version as of May 2023 is 10.9 #} {% block mariadb_clustercheck_version %} -ARG mariadb_clustercheck_version=10.6 +ARG mariadb_clustercheck_version=10.9 ARG mariadb_clustercheck_url=https://src.fedoraproject.org/rpms/mariadb/raw/${mariadb_clustercheck_version}/f/clustercheck.sh {% endblock %} |