Skip to content

Commit

Permalink
Merge pull request #162 from stackhpc/upstream/yoga-2022-09-05
Browse files Browse the repository at this point in the history
Synchronise yoga with upstream
  • Loading branch information
markgoddard authored Sep 5, 2022
2 parents 89475e4 + b3e7221 commit 1630c12
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 13 deletions.
6 changes: 3 additions & 3 deletions docker/base/mariadb-aarch64.repo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[mariadb]
name = MariaDB
baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-aarch64
module_hotfixes = 1
name = MariaDB Server
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/8/aarch64
gpgcheck = 1
enabled = 0
module_hotfixes = 1
6 changes: 3 additions & 3 deletions docker/base/mariadb.repo
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[mariadb]
name = MariaDB
baseurl = https://downloads.mariadb.com/MariaDB/mariadb-10.6/yum/centos8-amd64
module_hotfixes = 1
name = MariaDB Server
baseurl = https://dlm.mariadb.com/repo/mariadb-server/10.6/yum/rhel/8/x86_64
gpgcheck = 1
enabled = 0
module_hotfixes = 1
11 changes: 8 additions & 3 deletions kolla/image/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -307,9 +307,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:
Expand Down
8 changes: 4 additions & 4 deletions kolla/template/repos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ debian:
component: "main"
gpg_key: "elasticsearch.asc"
mariadb:
url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian"
suite: "bullseye"
component: "main"
gpg_key: "mariadb.gpg"
Expand Down Expand Up @@ -124,7 +124,7 @@ debian-aarch64:
component: "main"
gpg_key: "elasticsearch.asc"
mariadb:
url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/debian"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/debian"
suite: "bullseye"
component: "main"
gpg_key: "mariadb.gpg"
Expand Down Expand Up @@ -181,7 +181,7 @@ ubuntu:
component: "main"
gpg_key: "elasticsearch.asc"
mariadb:
url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu"
suite: "focal"
component: "main"
gpg_key: "mariadb.gpg"
Expand Down Expand Up @@ -233,7 +233,7 @@ ubuntu-aarch64:
component: "main"
gpg_key: "elasticsearch.asc"
mariadb:
url: "http://downloads.mariadb.com/MariaDB/mariadb-10.6/repo/ubuntu"
url: "https://dlm.mariadb.com/repo/mariadb-server/10.6/repo/ubuntu"
suite: "focal"
component: "main"
gpg_key: "mariadb.gpg"
Expand Down
5 changes: 5 additions & 0 deletions releasenotes/notes/docker-6-6d77b5ff7ec1daef.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes problems when running with docker-py >=6.
`LP#1988121 <https://launchpad.net/bugs/1988121>`__

0 comments on commit 1630c12

Please sign in to comment.