Merge pull request #161 from stackhpc/upstream/xena-2022-09-05

Synchronise xena with upstream

Author: markgoddard

docker/base/mariadb-aarch64.repo

@@ -1,6 +1,6 @@
 [mariadb]
-name = MariaDB
-baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-aarch64
-module_hotfixes = 1
+name = MariaDB Server
+baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.5/yum/rhel/8/aarch64
 gpgcheck = 1
 enabled = 0
+module_hotfixes = 1

docker/base/mariadb.repo

@@ -1,6 +1,6 @@
 [mariadb]
-name = MariaDB
-baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.5/yum/centos8-amd64
-module_hotfixes = 1
+name = MariaDB Server
+baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.5/yum/rhel/8/x86_64
 gpgcheck = 1
 enabled = 0
+module_hotfixes = 1

kolla/image/build.py

@@ -311,9 +311,14 @@ def push_image(self, image):
 
         # Since docker 3.0.0, the argument of 'insecure_registry' is removed.
         # To be compatible, set 'insecure_registry=True' for old releases.
-        dc_running_ver = StrictVersion(docker.version)
-        if dc_running_ver < StrictVersion('3.0.0'):
-            kwargs['insecure_registry'] = True
+        # NOTE(frickler): The version check will fail for docker >= 6.0, but
+        # in that case we know that the workaround isn't needed.
+        try:
+            dc_running_ver = StrictVersion(docker.version)
+            if dc_running_ver < StrictVersion('3.0.0'):
+                kwargs['insecure_registry'] = True
+        except TypeError:
+            pass
 
         for response in self.dc.push(image.canonical_name, **kwargs):
             if 'stream' in response:

kolla/template/repos.yaml

@@ -74,7 +74,7 @@ debian:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian"
+    url: "https://dlm.mariadb.com/repo/mariadb-server/10.5/repo/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -126,7 +126,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/debian"
+    url: "https://dlm.mariadb.com/repo/mariadb-server/10.5/repo/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -183,7 +183,7 @@ ubuntu:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu"
+    url: "https://dlm.mariadb.com/repo/mariadb-server/10.5/repo/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "mariadb.gpg"
@@ -235,7 +235,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   mariadb:
-    url: "http://downloads.mariadb.com/MariaDB/mariadb-10.5/repo/ubuntu"
+    url: "https://dlm.mariadb.com/repo/mariadb-server/10.5/repo/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "mariadb.gpg"

releasenotes/notes/docker-6-6d77b5ff7ec1daef.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes problems when running with docker-py >=6.
+    `LP#1988121 <https://launchpad.net/bugs/1988121>`__