particle-os/debian-bootc-base-images
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bootc-base-imagectl: make --add-dir use ostree-override-layers instead

Browse source 
The "override" semantic is closer to what most users expect I think from
`--add-dir` rather than having it error out if some files already exist.
This makes it closer to how e.g. `COPY` works in Dockerfiles.
This commit is contained in:
Jonathan Lebon 2025-08-14 16:31:19 -04:00
parent d4fa2dd975
commit ae075fe766
No known key found for this signature in database
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bootc-base-imagectl
View file

@ -40,7 +40,7 @@ def run_build_rootfs(args):
tmp_ostree_repo = tempfile.mkdtemp(dir='/var/tmp')
subprocess.check_call(['ostree', 'init', '--repo', tmp_ostree_repo, '--mode=bare'])
rpmostree_argv.append(f"--ostree-repo={tmp_ostree_repo}")
override_manifest['ostree-layers'] = []
override_manifest['ostree-override-layers'] = []
for dir in args.add_dir:
base = os.path.basename(dir)
@ -48,7 +48,7 @@ def run_build_rootfs(args):
# capture output to hide commit digest printed
subprocess.check_output(['ostree', 'commit', '--repo', tmp_ostree_repo, '-b', f'overlay/{base}', abs,
'--owner-uid=0', '--owner-gid=0', '--no-xattrs', '--mode-ro-executables'])
override_manifest['ostree-layers'].append(f'overlay/{base}')
override_manifest['ostree-override-layers'].append(f'overlay/{base}')
if args.no_docs:
override_manifest['documentation'] = False
if args.sysusers: