Skip to content

Commit

Permalink
Merge pull request #1633 from SUSE/use_obs
Browse files Browse the repository at this point in the history
Use OBS repositories also for docker/podman builds
  • Loading branch information
dirkmueller authored Sep 12, 2024
2 parents 0964af3 + 0f405e9 commit 6c12d2d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bci_build/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
DOCKERFILE_TEMPLATE = jinja2.Template(
"""# SPDX-License-Identifier: {{ image.license }}
{{ INFOHEADER }}
{% if image.exclusive_arch %}#!ExclusiveArch: {% for arch in image.exclusive_arch %}{{ arch }}{{ " " if not loop.last }}{% endfor %}
{%- endif %}
#!UseOBSRepositories
{% if image.exclusive_arch %}#!ExclusiveArch: {% for arch in image.exclusive_arch %}{{ arch }}{{ " " if not loop.last }}{% endfor %}{%- endif %}
{% for tag in image.build_tags -%}
#!BuildTag: {{ tag }}
{% endfor -%}
Expand Down
4 changes: 4 additions & 0 deletions tests/test_build_recipe.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
(
"""# SPDX-License-Identifier: MIT
# Copyright header
#!UseOBSRepositories
#!BuildTag: bci/test:27
#!BuildTag: bci/test:27-%RELEASE%
Expand Down Expand Up @@ -123,6 +124,7 @@
(
"""# SPDX-License-Identifier: MIT
# Copyright header
#!UseOBSRepositories
#!BuildTag: bci/test:stable
#!BuildTag: bci/test:stable-1.%RELEASE%
Expand Down Expand Up @@ -221,6 +223,7 @@
(
"""# SPDX-License-Identifier: MIT
# Copyright header
#!UseOBSRepositories
#!BuildTag: bci/test:29
#!BuildTag: bci/test:29-%RELEASE%
Expand Down Expand Up @@ -318,6 +321,7 @@
(
"""# SPDX-License-Identifier: BSD
# Copyright header
#!UseOBSRepositories
#!ExclusiveArch: x86_64 s390x
#!BuildTag: opensuse/bci/test:28.2
#!BuildTag: opensuse/bci/test:28.2-%RELEASE%
Expand Down

0 comments on commit 6c12d2d

Please sign in to comment.