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

Drop fedora- prefix from canonical manifests

Browse source 
It's confusing right now how the manifest names differ across
fedora-bootc, centos-bootc and rhel-bootc. Both rhel-bootc and
centos-bootc only use "bare" names like `minimal`, and `standard`, while
fedora-bootc prefixes everything with `fedora-`.

For FCOS/SCOS/RHCOS, it would be beneficial to maintain the same naming
across all of those.

Let's just match the naming here to the "bare" version. But add symlinks
so that we don't break the old names (but note that being symlinks, they
will no longer show up in `bootc-base-imagectl list`).
This commit is contained in:
Jonathan Lebon 2025-06-16 15:35:27 -04:00
parent a750416a16
commit 040f6319f5
No known key found for this signature in database
25 changed files with 48 additions and 42 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.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.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.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.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.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.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.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.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

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.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

4
install-manifests
View file

@ -7,7 +7,9 @@ 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
cp -a $image.yaml $manifestdir/
# 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.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