diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 59bd995..e201329 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,14 @@ build-minimal: buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal ${PRIV_ARGS} --build-arg=manifest=fedora-minimal . cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal +build-minimal-plus: + extends: .build-image + script: | + set -xeuo pipefail + buildah build -f Containerfile --no-cache -t localhost/fedora-bootc:minimal-plus ${PRIV_ARGS} --build-arg=manifest=fedora-minimal-plus . + cd tests/rootfs && buildah build -t localhost/test --from localhost/fedora-bootc:minimal-plus + + standard-build-and-test: extends: .build-image script: | diff --git a/README.md b/README.md index 4c2d4bd..02b1e68 100644 --- a/README.md +++ b/README.md @@ -63,15 +63,12 @@ to support smaller custom images. For more on this, see - **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 a container base image. -- **tier-x**: This content set is the shared base used by all image-based +- **minimal-plus**: This content set is intended to be the shared base used by all image-based Fedora variants (IoT, Atomic Desktops, and CoreOS). - 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 - command above. -**standard** inherits from **tier-x** and **tier-x** in turn inherit from **minimal**. +**standard** inherits from **minimal-plus** and **minimal-plus** 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 **minimal-plus** should be ACKed by at least one stakeholder of each Fedora variant WGs. ## More information diff --git a/fedora-tier-x.yaml b/fedora-minimal-plus.yaml similarity index 57% rename from fedora-tier-x.yaml rename to fedora-minimal-plus.yaml index eb2a3e9..a987b38 100644 --- a/fedora-tier-x.yaml +++ b/fedora-minimal-plus.yaml @@ -1,3 +1,3 @@ include: - fedora-includes/generic.yaml - - tier-x/manifest.yaml + - minimal-plus/manifest.yaml diff --git a/install-manifests b/install-manifests index 1290411..867eb62 100755 --- a/install-manifests +++ b/install-manifests @@ -4,7 +4,7 @@ set -xeuo pipefail # into their installed location. manifestdir=${1:-/usr/share/doc/bootc-base-imagectl/manifests} mkdir -p "$manifestdir/" -for image in minimal standard tier-x; do +for image in minimal standard minimal-plus; do # Embed the generic defaults cp -a $image $manifestdir/ # And the Fedora-specific tweaks diff --git a/tier-x/manifest.yaml b/minimal-plus/manifest.yaml similarity index 85% rename from tier-x/manifest.yaml rename to minimal-plus/manifest.yaml index 0b5d0d3..c45d9b2 100644 --- a/tier-x/manifest.yaml +++ b/minimal-plus/manifest.yaml @@ -1,10 +1,7 @@ metadata: summary: | - A relatively full, but still generic base image. Roughly - similar to a smaller Fedora CoreOS. Includes NetworkManager, - openssh, various CLI tools, etc. - - Automatic updates are not on by default. + This content set is intended to be the shared base used by all image-based + Fedora variants (IoT, Atomic Desktops, and CoreOS). include: - ../minimal/manifest.yaml diff --git a/standard/manifest.yaml b/standard/manifest.yaml index 499d298..4810817 100644 --- a/standard/manifest.yaml +++ b/standard/manifest.yaml @@ -8,7 +8,7 @@ metadata: recommends: true include: - - ../tier-x/manifest.yaml + - ../minimal-plus/manifest.yaml - autoupdates.yaml - networking-tools.yaml - system-configuration.yaml