tier-0: Rename to minimal
The "tiers" nomenclature ended up being unhelpful since we introduced "tier-x" which is between tier-0 and tier-1. We also never exposed the tier naming outside of our source code. In preparation for doing so, rename to tier-0 to "minimal" which is a bit more descriptive. Renaming the other images will follow. Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
parent
d2db39499f
commit
09c902e1fc
|
|
@ -24,7 +24,7 @@ build-image:
|
||||||
extends: .build-image
|
extends: .build-image
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- TIER: [tier-0, tier-1, tier-x]
|
- TIER: [minimal, tier-1, tier-x]
|
||||||
variables:
|
variables:
|
||||||
EXTRA_ARGS: "--security-opt=label=disable --cap-add=all --build-arg MANIFEST=fedora-$TIER.yaml"
|
EXTRA_ARGS: "--security-opt=label=disable --cap-add=all --build-arg MANIFEST=fedora-$TIER.yaml"
|
||||||
rules:
|
rules:
|
||||||
|
|
|
||||||
11
README.md
11
README.md
|
|
@ -60,19 +60,18 @@ to support smaller custom images. For more on this, see
|
||||||
|
|
||||||
- **tier-1**: This image is the default, what is published as
|
- **tier-1**: This image is the default, what is published as
|
||||||
https://quay.io/repository/fedora/fedora-bootc
|
https://quay.io/repository/fedora/fedora-bootc
|
||||||
- **tier-0**: This content set is more of a convenient centralization point for CI
|
- **minimal**: This content set is more of a convenient centralization point for CI
|
||||||
and curation around a package set that we can all agree is the rough minimum
|
and curation around a package set that is intended as a starting point fror
|
||||||
necessary for a usable system. It's not meant to be used as is, but layered
|
a container base image.
|
||||||
upon.
|
|
||||||
- **tier-x**: This content set is the shared base used by all image-based
|
- **tier-x**: This content set is the shared base used by all image-based
|
||||||
Fedora variants (IoT, Atomic Desktops, and CoreOS).
|
Fedora variants (IoT, Atomic Desktops, and CoreOS).
|
||||||
Changes to this tier may be done without accounting for external users.
|
Changes to this tier may be done without accounting for external users.
|
||||||
To build this, pass `--build-arg=MANIFEST=fedora-tier-x.yaml` to the build
|
To build this, pass `--build-arg=MANIFEST=fedora-tier-x.yaml` to the build
|
||||||
command above.
|
command above.
|
||||||
|
|
||||||
**tier-1** inherits from **tier-x** and **tier-x** in turn inherit from **tier-0**.
|
**tier-1** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**.
|
||||||
|
|
||||||
All non-trivial changes to **tier-0** and **tier-x** should be ACKed by at least
|
All non-trivial changes to **minimal** and **tier-x** should be ACKed by at least
|
||||||
one stakeholder of each Fedora variant WGs.
|
one stakeholder of each Fedora variant WGs.
|
||||||
|
|
||||||
## More information
|
## More information
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,5 @@ metadata:
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- fedora-generic.yaml
|
- fedora-generic.yaml
|
||||||
- tier-0/manifest.yaml
|
- minimal/manifest.yaml
|
||||||
- tier-0/kernel.yaml
|
- minimal/kernel.yaml
|
||||||
|
|
@ -30,7 +30,7 @@ packages:
|
||||||
# in dnf5. In CentOS/RHEL, this pulls in dnf(4). We can simplify this back to
|
# in dnf5. In CentOS/RHEL, this pulls in dnf(4). We can simplify this back to
|
||||||
# just `dnf` once the `dnf` package is retired from Fedora.
|
# just `dnf` once the `dnf` package is retired from Fedora.
|
||||||
- /usr/bin/dnf
|
- /usr/bin/dnf
|
||||||
# Even in tier-0, we have this. If you don't want SELinux today, you'll need
|
# Even in minimal, we have this. If you don't want SELinux today, you'll need
|
||||||
# to build a custom image.
|
# to build a custom image.
|
||||||
- selinux-policy-targeted
|
- selinux-policy-targeted
|
||||||
# And we want container-selinux because trying to layer it on later currently causes issues.
|
# And we want container-selinux because trying to layer it on later currently causes issues.
|
||||||
|
|
@ -7,7 +7,7 @@ opt-usrlocal: "root"
|
||||||
machineid-compat: true
|
machineid-compat: true
|
||||||
|
|
||||||
# Note that the default for c9s+ is sqlite; we can't rely on rpm being
|
# Note that the default for c9s+ is sqlite; we can't rely on rpm being
|
||||||
# in the target (it isn't in tier-0!) so turn this to host here. This
|
# in the target (it isn't in minimal!) so turn this to host here. This
|
||||||
# does break the "hermetic build" aspect a bit. Maybe eventually
|
# does break the "hermetic build" aspect a bit. Maybe eventually
|
||||||
# what we should do is special case this and actually install RPM temporarily
|
# what we should do is special case this and actually install RPM temporarily
|
||||||
# and then remove it...
|
# and then remove it...
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
include:
|
include:
|
||||||
- ../tier-0/manifest.yaml
|
- ../minimal/manifest.yaml
|
||||||
|
|
||||||
packages:
|
packages:
|
||||||
# Used by admins interactively
|
# Used by admins interactively
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue