Skip to content

Commit 0f405e9

Browse files
committed
Use OBS repositories also for docker/podman builds
This was already set for kiwi, however for docker we fell back to default repositories which are the repositories of the base container which could be different (they are when building against a released base container from the SUSE:Registry)
1 parent 931b8b9 commit 0f405e9

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/bci_build/templates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
DOCKERFILE_TEMPLATE = jinja2.Template(
2828
"""# SPDX-License-Identifier: {{ image.license }}
2929
{{ INFOHEADER }}
30-
{% if image.exclusive_arch %}#!ExclusiveArch: {% for arch in image.exclusive_arch %}{{ arch }}{{ " " if not loop.last }}{% endfor %}
31-
{%- endif %}
30+
#!UseOBSRepositories
31+
{% if image.exclusive_arch %}#!ExclusiveArch: {% for arch in image.exclusive_arch %}{{ arch }}{{ " " if not loop.last }}{% endfor %}{%- endif %}
3232
{% for tag in image.build_tags -%}
3333
#!BuildTag: {{ tag }}
3434
{% endfor -%}

tests/test_build_recipe.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
(
2121
"""# SPDX-License-Identifier: MIT
2222
# Copyright header
23+
#!UseOBSRepositories
2324
2425
#!BuildTag: bci/test:27
2526
#!BuildTag: bci/test:27-%RELEASE%
@@ -123,6 +124,7 @@
123124
(
124125
"""# SPDX-License-Identifier: MIT
125126
# Copyright header
127+
#!UseOBSRepositories
126128
127129
#!BuildTag: bci/test:stable
128130
#!BuildTag: bci/test:stable-1.%RELEASE%
@@ -221,6 +223,7 @@
221223
(
222224
"""# SPDX-License-Identifier: MIT
223225
# Copyright header
226+
#!UseOBSRepositories
224227
225228
#!BuildTag: bci/test:29
226229
#!BuildTag: bci/test:29-%RELEASE%
@@ -318,6 +321,7 @@
318321
(
319322
"""# SPDX-License-Identifier: BSD
320323
# Copyright header
324+
#!UseOBSRepositories
321325
#!ExclusiveArch: x86_64 s390x
322326
#!BuildTag: opensuse/bci/test:28.2
323327
#!BuildTag: opensuse/bci/test:28.2-%RELEASE%

0 commit comments

Comments
 (0)