Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-10-12 00:22:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(oci): preserve multi-arch digest during recreate

Browse Source
This commit is contained in:
VAIO73
2026-10-06 18:22:42 +02:00
parent 3b6615194f
commit 0cf62149fd
3 changed files with 65 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oci/remote/oci_installation_state.py
+3 -1
View File
@@ -166,6 +166,7 @@ def resolve_candidate(reference, architecture):
if '@' in reference:
transport = repo + '@' + reference.split('@', 1)[1]
raw = command('skopeo', 'inspect', '--raw', 'docker://' + transport)
registry_digest = 'sha256:' + sha(raw)
manifest = json.loads(raw)
if 'manifests' in manifest:
matches = [m for m in manifest['manifests'] if m.get('platform', {}).get('architecture') == architecture
@@ -192,7 +193,8 @@ def resolve_candidate(reference, architecture):
# The build date identifies the image as the publisher released it: it is
# what changes when an image is rebuilt, whether or not the application
# version inside it moved.
return {'manifest_digest': digest, 'layers': [layer['digest'] for layer in json.loads(raw).get('layers', [])],
return {'manifest_digest': digest, 'registry_digest': registry_digest,
'layers': [layer['digest'] for layer in json.loads(raw).get('layers', [])],
'defaults': defaults, 'version': version, 'created': config.get('created')}
oci/remote/oci_update_current.py
+4 -1
View File
@@ -67,7 +67,10 @@ def resolve_archive(desired, config, current=None, check=None, required_digest=N
digest = candidate['manifest_digest']
if not re.fullmatch(r'sha256:[a-f0-9]{64}', digest):
raise ValueError(translate('Invalid registry digest'))
if required_digest is not None and digest != required_digest:
registry_digest = candidate.get('registry_digest')
if registry_digest is not None and not re.fullmatch(r'sha256:[a-f0-9]{64}', registry_digest):
raise ValueError(translate('Invalid registry digest'))
if required_digest is not None and registry_digest != required_digest:
raise ValueError(translate('The registry did not return the saved image digest'))
msg_ok(f"{translate('Image:')} {reference} ({candidate.get('version') or digest[7:19]})")
if current and same_image(candidate, current):