PR#1028: container-toolbox: Synchronize with the Container/Dockerfile equivalents of the fedora-toolbox:38 and RHEL images - fedora-kickstarts

		`@@ -40,6 +40,7 @@`
		`-fuse-libs`
		`gawk`
		`git`
		`+ -glibc-langpack-en`
		`-glibc-minimal-langpack`
		`glibc-all-langpacks`
		`gnupg2`
		`@@ -111,9 +112,6 @@`

		`# Pre-installation commands`
		`%pre`
		`- # Copy README.md`
		`- cp /README.md /mnt/sysimage/README.md`
		`-`
		`# Remove macros.image-language-conf file`
		`rm -f /mnt/sysimage/etc/rpm/macros.image-language-conf`

		`@@ -174,13 +172,33 @@`
		`"/usr/share/man/man1/cat.1*"`
		`"/usr/share/man/man1/cp.1*"`
		`"/usr/share/man/man1/ls.1*"`
		`+ # cracklib-dicts`
		`+ "/usr/share/cracklib/cracklib-small.pwd*"`
		`+ "/usr/share/cracklib/pw_dict.pwd*"`
		`+ # dnf`
		`+ "/usr/share/man/man8/dnf.8*"`
		`+ # dnf-data`
		`+ "/usr/share/man/man5/dnf.conf.5*"`
		`+ # elfutils-libelf`
		`+ "/usr/share/locale/de/LC_MESSAGES/elfutils.mo"`
		`+ "/usr/share/locale/ja/LC_MESSAGES/elfutils.mo"`
		`+ # gawk-all-langpacks`
		`+ "/usr/share/locale/fr/LC_MESSAGES/gawk.mo"`
		`+ "/usr/share/locale/ko/LC_MESSAGES/gawk.mo"`
		`# gnupg2`
		`"/usr/share/man/man1/gpg2.1*"`
		`"/usr/share/man/man7/gnupg2.7*"`
		`+ # nettle`
		`+ "/usr/share/info/nettle.info*"`
		`+ # popt`
		`+ "/usr/share/locale/fr/LC_MESSAGES/popt.mo"`
		`+ "/usr/share/locale/ja/LC_MESSAGES/popt.mo"`
		`# psmisc`
		`"/usr/share/man/fr/man1/pstree.1*"`
		`"/usr/share/man/ko/man1/pstree.1*"`
		`"/usr/share/man/man1/pstree.1*"`
		`+ # readline`
		`+ "/usr/share/info/history.info*"`
		`# rpm`
		`"/usr/share/man/man8/rpm.8*"`
		`"/usr/share/man/man8/rpm2cpio.8*"`
		`@@ -211,8 +229,20 @@`
		`done`

		`if [ "$ret_val" -ne 0 ]; then`
		`- false`
		`+ exit 1`
		`fi`
		`+`
		`+ broken_packages="$(rpm --all --query --state --queryformat "PACKAGE: %{NAME}\n" \`
		`+ \| sed --quiet --regexp-extended '/PACKAGE: /{s/PACKAGE: // ; h ; b }; /^not installed/ { g; p }' \`
		`+ \| uniq \`
		`+ \| sort)"`
		`+`
		`+ if [ "$broken_packages" != "" ]; then`
		`+ echo "Packages with missing files:" >&2`
		`+ echo "$broken_packages" >&2`
		`+ exit 1`
		`+ fi`
		`+`
		`%end`

		`# Perform any necessary post-installation configurations specific to Fedora Toolbox (nochroot environment)`

rishi commented 2 months ago

Prevents the redundant glibc-langpack-en from creeping in, adds a new test, extends the list of files used by the existing test, and removes a spurious error message from the logs.

There should be no user-visible impact.

ngompa commented 2 months ago

As of yesterday, we switched over to kiwi for this: https://pagure.io/pungi-fedora/c/9996561c1dbfe2ef3c4936ee887be3113ccf5a6a

rebased onto 4f6af9b

2 months ago

rishi commented 2 months ago

As of yesterday, we switched over to kiwi for this: https://pagure.io/pungi-fedora/c/9996561c1dbfe2ef3c4936ee887be3113ccf5a6a

Good to know. I was going to ask because I am still seeing:

$ podman inspect --format '{{ .Comment }}' --type image registry.fedoraproject.org/fedora-toolbox:41
Created by Image Factory

I will have some PRs for fedora-kiwi-kickstarts soon. I got a bit lost in the weeds of the KIWI code and systemd-firstboot, but got back on track again.

Anyway, I will leave this PR here. If we are not building from the Kickstarts at the moment, then there shouldn't be any immediate impact, negative or otherwise, from landing them.

They will be there in case we need a contingency plan, or for those building custom images based on fedora-toolbox, and will make it easier for me to compare the koji image-build outcome with KIWI by not needing to have a throwaway branch around.

Edited 2 months ago by rishi

rishi commented 2 months ago

As of yesterday, we switched over to kiwi for this: https://pagure.io/pungi-fedora/c/9996561c1dbfe2ef3c4936ee887be3113ccf5a6a

It looks like the images that I just pulled are still built by Image Factory:

$ podman inspect \
    --format '{{ .Comment }}' \
    --type image \
    registry.fedoraproject.org/fedora-toolbox:41
Created by Image Factory
$ podman inspect \
    --format '{{ .Comment }}' \
    --type image \
    registry.fedoraproject.org/fedora-toolbox:40
Created by Image Factory