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

Merge branch 'pr/tweak-links' into 'main'

Browse source 
Drop `fedora-` prefix from canonical manifests and hide minimal-plus

See merge request fedora/bootc/base-images!210
This commit is contained in:
Colin Walters (Red Hat) 2025-06-17 20:43:07 +00:00
commit 4d7013a2cf
26 changed files with 58 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.tekton/fedora-bootc-42-iot-pull-request.yaml
View file

@ -9,9 +9,9 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./fedora-minimal-plus.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./fedora-minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-42-iot-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

6
.tekton/fedora-bootc-42-iot-push.yaml
View file

@ -8,9 +8,9 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./fedora-minimal-plus.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./fedora-minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-42-iot-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-42-minimal-plus-pull-request.yaml
View file

@ -9,7 +9,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-minimal-plus.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-plus-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-42-minimal-plus-push.yaml
View file

@ -8,7 +8,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-minimal-plus.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-plus-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-42-minimal-pull-request.yaml
View file

@ -9,7 +9,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-42-minimal-push.yaml
View file

@ -8,7 +8,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-42-minimal-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-42-standard-pull-request.yaml
View file

@ -9,7 +9,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-42-standard-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-42-standard-push.yaml
View file

@ -8,7 +8,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-42-standard-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

6
.tekton/fedora-bootc-rawhide-iot-pull-request.yaml
View file

@ -9,9 +9,9 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./fedora-minimal-plus.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./fedora-minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-rawhide-iot-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

6
.tekton/fedora-bootc-rawhide-iot-push.yaml
View file

@ -8,9 +8,9 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./fedora-minimal-plus.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./fedora-minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
== "main" && ( "./iot.yaml".pathChanged() || "./iot/***".pathChanged()
|| "./minimal-plus.hidden.yaml".pathChanged() || "./minimal-plus/***".pathChanged()
|| "./minimal.yaml".pathChanged() || "./minimal/***".pathChanged() ||
"./fedora-includes/generic.yaml".pathChanged() || ".tekton/fedora-bootc-rawhide-iot-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml
View file

@ -9,7 +9,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-minimal-plus.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-plus-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-rawhide-minimal-plus-push.yaml
View file

@ -8,7 +8,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-minimal-plus.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal-plus.hidden.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal-plus/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-plus-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-rawhide-minimal-pull-request.yaml
View file

@ -9,7 +9,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-rawhide-minimal-push.yaml
View file

@ -8,7 +8,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./minimal.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./minimal/***".pathChanged() || ".tekton/fedora-bootc-rawhide-minimal-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-rawhide-standard-pull-request.yaml
View file

@ -9,7 +9,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "true"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
== "main" && ( "./fedora-standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-rawhide-standard-pull-request.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

2
.tekton/fedora-bootc-rawhide-standard-push.yaml
View file

@ -8,7 +8,7 @@ metadata:
pipelinesascode.tekton.dev/cancel-in-progress: "false"
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
== "main" && ( "./fedora-standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
== "main" && ( "./standard.yaml".pathChanged() || "./fedora-includes/generic.yaml".pathChanged()
|| "./standard/***".pathChanged() || ".tekton/fedora-bootc-rawhide-standard-push.yaml".pathChanged()
|| "Containerfile".pathChanged() )
creationTimestamp: null

10
bootc-base-imagectl
View file

@ -17,10 +17,12 @@ def run_build_rootfs(args):
Regenerates a base image using a build configuration.
"""
target = args.target
if os.path.isdir(args.manifest):
manifest_path = os.path.join(f'/{MANIFESTDIR}', args.manifest, 'manifest.yaml')
for fn in [f'{args.manifest}.yaml', f'{args.manifest}.hidden.yaml']:
manifest_path = f'/{MANIFESTDIR}/{fn}'
if os.path.exists(manifest_path):
break
else:
manifest_path = f'/{MANIFESTDIR}/{args.manifest}.yaml'
raise Exception(f"manifest not found: {args.manifest}")
rpmostree_argv = ['rpm-ostree', 'compose', 'rootfs']
@ -119,7 +121,7 @@ def run_list(args):
d = '/' + MANIFESTDIR
for ent in sorted(os.listdir(d)):
name, ext = os.path.splitext(ent)
if ext != '.yaml':
if ext != '.yaml' or name.endswith('.hidden'):
continue
fullpath = os.path.join(d, ent)
if os.path.islink(fullpath):

4
fedora-iot.yaml
View file

@ -1,4 +0,0 @@
include:
- iot/manifest.yaml
- fedora-minimal-plus.yaml

1
fedora-iot.yaml Symbolic link
View file

@ -0,0 +1 @@
iot.yaml

3
fedora-minimal-plus.yaml
View file

@ -1,3 +0,0 @@
include:
- fedora-includes/generic.yaml
- minimal-plus/manifest.yaml

1
fedora-minimal-plus.yaml Symbolic link
View file

@ -0,0 +1 @@
minimal-plus.hidden.yaml

3
fedora-minimal.yaml
View file

@ -1,3 +0,0 @@
include:
- fedora-includes/generic.yaml
- minimal/manifest.yaml

1
fedora-minimal.yaml Symbolic link
View file

@ -0,0 +1 @@
minimal.yaml

7
fedora-standard.yaml
View file

@ -1,7 +0,0 @@
include:
- fedora-includes/generic.yaml
- standard/manifest.yaml
packages:
# Make Ansible "package" builtin work by default
- python3-libdnf5

1
fedora-standard.yaml Symbolic link
View file

@ -0,0 +1 @@
standard.yaml

8
install-manifests
View file

@ -7,7 +7,13 @@ mkdir -p "$manifestdir/"
for image in minimal standard minimal-plus iot; do
# Embed the generic defaults
cp -a $image $manifestdir/
# And the Fedora-specific tweaks
# And the top-level Fedora-specific manifests
if [ -f $image.hidden.yaml ]; then
cp -a $image.hidden.yaml $manifestdir/
else
cp -a $image.yaml $manifestdir/
fi
# And the legacy `fedora-` prefixed names
cp -a fedora-$image.yaml $manifestdir/
done
# Set the default

4
iot.yaml Normal file
View file

@ -0,0 +1,4 @@
include:
- iot/manifest.yaml
- fedora-minimal-plus.yaml

3
minimal-plus.hidden.yaml Normal file
View file

@ -0,0 +1,3 @@
include:
- fedora-includes/generic.yaml
- minimal-plus/manifest.yaml

3
minimal.yaml Normal file
View file

@ -0,0 +1,3 @@
include:
- fedora-includes/generic.yaml
- minimal/manifest.yaml

7
standard.yaml Normal file
View file

@ -0,0 +1,7 @@
include:
- fedora-includes/generic.yaml
- standard/manifest.yaml
packages:
# Make Ansible "package" builtin work by default
- python3-libdnf5