Skip to content

Commit

Permalink
Merge pull request #2026 from SUSE/bcntsync
Browse files Browse the repository at this point in the history
Set BcntSyncTag for multibuild dockerfiles
  • Loading branch information
dcermak authored Nov 25, 2024
2 parents b25c8ea + 6752028 commit bde2832
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/bci_build/package/apache_tomcat.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def _get_java_packages(jre_major: int) -> list[str]:
version="%%tomcat_version%%",
tag_version=tomcat_ver,
build_flavor=f"openjdk{jre_version}",
_min_release_counter=None if not os_version.is_sle15 else 55,
_min_release_counter=58 if os_version.is_sle15 else None,
supported_until=_get_sac_supported_until(
os_version=os_version, tomcat_ver=tomcat_ver, jre_major=jre_version
),
Expand Down
2 changes: 2 additions & 0 deletions src/bci_build/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
{% endfor -%}
{%- if image.publish_registry.force_multiversion -%}#!ForceMultiVersion
{% endif -%}
{%- if image.crate and image.build_flavor %}#!BcntSyncTag: {{ image.package_name }}
{% endif -%}
{% if image.build_version %}#!BuildName: {{ image.build_name }}
#!BuildVersion: {{ image.build_version }}
{%- endif %}
Expand Down

0 comments on commit bde2832

Please sign in to comment.