gian/ceph-mirror
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2026-08-02 07:03:18 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #66404 from tchaikov/wip-bwc-with-more-branch-names

Browse Source 
script: sanitize git branch names for OCI tag compliance

Reviewed-by: John Mulligan <jmulligan@redhat.com>
This commit is contained in:
Kefu Chai 2025-12-10 11:21:54 +08:00 committed by GitHub
commit bc1d1ca974
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/script/build-with-container.py
View File

@ -317,6 +317,26 @@ def _git_current_sha(ctx, short=True):
return res.stdout.decode("utf8").strip()
def _sanitize_for_oci_tag(branch_name):
"""Sanitize a git branch name to be OCI tag compliant.
OCI tags must match: [a-zA-Z0-9_][a-zA-Z0-9._-]{0,127}
"""
sanitized = branch_name.replace("/", "-")
sanitized = re.sub(r"[^a-zA-Z0-9._-]", "_", sanitized)
sanitized = re.sub(r"^[^a-zA-Z0-9_]+", "", sanitized)
result = sanitized[:128] if sanitized else "UNKNOWN"
if result != branch_name:
log.warning(
"Branch name '%s' was sanitized to '%s' for OCI tag compliance",
branch_name,
result
)
return result
@ftcache
def _hash_sources(bsize=4096):
hh = hashlib.sha256()
@ -504,9 +524,11 @@ class Context:
branch = self.cli.current_branch
if not branch:
try:
branch = _git_current_branch(self).replace("/", "-")
branch = _git_current_branch(self)
except subprocess.CalledProcessError:
branch = "UNKNOWN"
# Sanitize branch name to be OCI tag compliant
branch = _sanitize_for_oci_tag(branch)
variant = self.variant()
if variant is not ImageVariant.DEFAULT:
suffix = f".{variant}{suffix}"