Skip to content

Commit b7d81f4

Browse files
dougszumskipriteau
authored andcommitted
Fix image registry conditional
`kolla_docker_registry` evaluates to an empty string if neither a docker or podman registry are configured. This leads to broken behaviour if an image build is attempted with a regex specified. Closes-bug: #2112646 Change-Id: I4548410d533731138de02780dc8b2013e71730d0 (cherry picked from commit 8f0c9a7)
1 parent 107e6a8 commit b7d81f4

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

ansible/container-image-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
kolla-build
5454
--config-dir {{ kolla_build_config_path }}
5555
--engine {{ container_engine }}
56-
{% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %}
56+
{% if kolla_docker_registry %}--registry {{ kolla_docker_registry }}{% endif %}
5757
{% if push_images | bool %}--push{% endif %}
5858
{% if nocache | bool %}--nocache{% endif %}
5959
{% if kolla_base_arch != ansible_facts.architecture %}--platform {{ platform }}{% endif %}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue building images with a regex when no image registry is set
5+
`LP#2112646 <https://bugs.launchpad.net/kayobe/+bug/2112646>`__

0 commit comments

Comments
 (0)