Rename "tier-1" to "standard"
Followup to the rename of "tier-0" to "minimal". The tiers nomenclature didn't end up working out. Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
parent
c5995391b2
commit
1561ff9b43
|
|
@ -24,7 +24,7 @@ build-image:
|
||||||
extends: .build-image
|
extends: .build-image
|
||||||
parallel:
|
parallel:
|
||||||
matrix:
|
matrix:
|
||||||
- TIER: [minimal, tier-1, tier-x]
|
- TIER: [minimal, standard, 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:
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ podman build --security-opt=label=disable --cap-add=all \
|
||||||
--device /dev/fuse -t localhost/fedora-bootc .
|
--device /dev/fuse -t localhost/fedora-bootc .
|
||||||
```
|
```
|
||||||
|
|
||||||
See the `Containerfile` for more details. This builds the default `tier-1` image.
|
See the `Containerfile` for more details. This builds the default `standard` image.
|
||||||
|
|
||||||
## Fedora versions
|
## Fedora versions
|
||||||
|
|
||||||
|
|
@ -58,7 +58,7 @@ It is planned to rework and improve this in the future, especially
|
||||||
to support smaller custom images. For more on this, see
|
to support smaller custom images. For more on this, see
|
||||||
[this tracker issue](https://gitlab.com/fedora/bootc/tracker/-/issues/32).
|
[this tracker issue](https://gitlab.com/fedora/bootc/tracker/-/issues/32).
|
||||||
|
|
||||||
- **tier-1**: This image is the default, what is published as
|
- **standard**: This image is the default, what is published as
|
||||||
https://quay.io/repository/fedora/fedora-bootc
|
https://quay.io/repository/fedora/fedora-bootc
|
||||||
- **minimal**: 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 is intended as a starting point fror
|
and curation around a package set that is intended as a starting point fror
|
||||||
|
|
@ -69,7 +69,7 @@ to support smaller custom images. For more on this, see
|
||||||
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 **minimal**.
|
**standard** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**.
|
||||||
|
|
||||||
All non-trivial changes to **minimal** 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.
|
||||||
|
|
|
||||||
|
|
@ -4,4 +4,4 @@ metadata:
|
||||||
|
|
||||||
include:
|
include:
|
||||||
- fedora-generic.yaml
|
- fedora-generic.yaml
|
||||||
- tier-1/manifest.yaml
|
- standard/manifest.yaml
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# Configuration for the "tier-1" initramfs
|
# Configuration for the initramfs
|
||||||
postprocess:
|
postprocess:
|
||||||
- |
|
- |
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
mkdir -p /usr/lib/dracut/dracut.conf.d
|
mkdir -p /usr/lib/dracut/dracut.conf.d
|
||||||
cat > /usr/lib/dracut/dracut.conf.d/30-bootc-tier-1.conf << 'EOF'
|
cat > /usr/lib/dracut/dracut.conf.d/30-bootc-standard.conf << 'EOF'
|
||||||
add_dracutmodules+=" lvm crypt fips "
|
add_dracutmodules+=" lvm crypt fips "
|
||||||
EOF
|
EOF
|
||||||
Loading…
Reference in New Issue