aboutsummaryrefslogtreecommitdiff
path: root/teams/cloud/container.xml
AgeCommit message (Collapse)Author
2024-03-11teams/cloud/container: Use 'toolbx' as VARIANT_ID in os-release(5)Gravatar Debarshi Ray
The same change was made to the Kickstart equivalent of the fedora-toolbox:41 OCI image recently [1]. This is meant to distinguish OCI containers and images that are designed specifically for Toolbx from others. Toolbx containers are long-lasting pet containers for interactive command line use, which makes them substantially different from short-lived containers running services. Therefore, it can be useful to be able to identify Toolbx containers and images when generating statistics about Fedora usage. [1] fedora-kickstarts commit 0d99c64eb2721c5b https://pagure.io/fedora-kickstarts/c/0d99c64eb2721c5b https://pagure.io/fedora-kickstarts/pull-request/1015 https://pagure.io/Fedora-Council/tickets/issue/449
2024-03-11teams/cloud/container: Drop zstd from ToolbxGravatar Debarshi Ray
The zstd RPM is neither part of the default Fedora Silverblue and Workstation installation [1], nor the Container/Dockerfile and Kickstart equivalents of the fedora-toolbox images [2,3]. Therefore, there's no need to need to include it in the KIWI description. Fallout from d27e4c3f6c3e13bcefe9d1d904386794140d8a91 [1] https://pagure.io/fedora-comps/ [2] https://src.fedoraproject.org/container/fedora-toolbox https://github.com/containers/toolbox/tree/main/images/fedora [3] https://pagure.io/fedora-kickstarts/blob/main/f/fedora-container-toolbox.ks https://pagure.io/fedora-kiwi-descriptions/pull-request/21
2024-03-11teams/cloud/container: Install languages & weak dependencies for ToolbxGravatar Debarshi Ray
The Container/Dockerfile and Kickstart equivalents of the fedora-toolbox OCI images installed all locale definitions, translations, and weak dependencies (barring exceptions) [1,2]. In fact, the Containerfile tried very hard to restore any content that was stripped out by the fedora base image. Hence, the KIWI descriptions should do the same. Sometimes, like in the case of the gawk and gawk-all-langpacks RPMs, skipping weak dependencies also strips out translations. The Kickstart files did this by decoupling fedora-container-common.ks from fedora-container-common.ks [3], and this is the KIWI equivalent of the same change. The separate 'packages' elements of types 'bootstrap' and 'image' [4] are no longer needed and have been fused into one. This avoids the need to specify the 'ignore' child elements separately. This change has two workarounds that deserve mention. First, enabling weak dependencies for the packages that used to come from the ContainerCore profile pulls in systemd, and config.xml specifies a keytable for all the KIWI descriptions. These two combined makes KIWI try to set the keymap/keytable using systemd-firstboot(1), and it fails the build with: [ INFO ]: Setting up keytable: [ DEBUG ]: EXEC: [chroot /path/to/image-root systemd-firstboot --help] [ DEBUG ]: EXEC: [chroot /path/to/image-root systemd-firstboot --keymap=us] [ DEBUG ]: EXEC: Failed with stderr: Keymap us is not installed. , stdout: (no output on stdout) [ ERROR ]: KiwiCommandError: chroot: stderr: Keymap us is not installed. , stdout: (no output on stdout) This has been worked around by making the keymaps available during the image build through the kbd-misc RPM, which is later uninstalled. Second, KIWI isn't passing the 'ignore' child elements to DNF [5], and hence they currently have no effect. This has been worked around by uninstalling the RPMs later. Some noteworthy changes in the list of RPMs in the fedora-toolbox image after this change: ... +gawk-all-langpacks-5.3.0-3.fc40.x86_64 ... -glibc-2.39.9000-5.fc41.i686 -glibc-gconv-extra-2.39.9000-5.fc41.i686 -glibc-minimal-langpack-2.39.9000-5.fc41.x86_64 ... -libgcc-14.0.1-0.8.fc41.i686 ... +python-unversioned-command-3.12.2-2.fc41.noarch They are all in line with the latest Kickstart equivalent of the image. [1] https://src.fedoraproject.org/container/fedora-toolbox https://github.com/containers/toolbox/tree/main/images/fedora [2] https://pagure.io/fedora-kickstarts/blob/main/f/fedora-container-toolbox.ks [3] fedora-kickstarts commit 30f76d387d9e7f5c https://pagure.io/fedora-kickstarts/c/30f76d387d9e7f5c https://pagure.io/fedora-kickstarts/pull-request/1002 [4] https://osinside.github.io/kiwi/concept_and_workflow/packages.html [5] https://github.com/OSInside/kiwi/issues/2499 https://pagure.io/fedora-kiwi-descriptions/pull-request/21
2024-03-06teams/cloud/container, tmt: Build the container images as OCI imagesGravatar Neal Gompa
This incorporates the labels that are expected for Fedora images.
2024-02-22Reorganize configuration around Fedora teamsGravatar Neal Gompa
This realigns the configuration into separate files/folders that would be modified by specific teams (e.g. WGs and SIGs).