From 319e5e8153452b4bc807c69f0847320973050e05 Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremycline@microsoft.com>
Date: Mon, 18 Mar 2024 11:13:15 -0400
Subject: container: update package list to match f39 more closely

Gary Buhrmaster noticed gzip was missing from the Fedora 40 container.
An extremely quick and gross diff produced by doing:

podman run -it --rm --entrypoint /usr/bin/rpm fedora:39 -qa \
  | sort | uniq | awk '{ split($0,a,"-[0-9]"); print a[1] }' > f39.txt

shows the following for Fedora Minimal 39 -> 40:

-abattis-cantarell-vf-fonts
+audit-libs
-default-fonts-core-sans
-fonts-filesystem
-google-noto-fonts-common
-google-noto-sans-mono-vf-fonts
-google-noto-sans-vf-fonts
-google-noto-serif-vf-fonts
-gpg-pubkey
+gpg-pubkey-a15b79cc
+json-c
-langpacks-core-en
-langpacks-en
-langpacks-fonts-en
+libcap-ng
+libeconf
-libsigsegv
+libtool-ltdl
+pam-libs
-systemd-libs
-util-linux-core
-zlib
+zlib-ng-compat

For Fedora 39 -> 40:

-authselect
-authselect-libs
-cracklib
-gpg-pubkey
+gpg-pubkey-a15b79cc
-gzip
-libdb
-libpwquality
-libsigsegv
+libtool-ltdl
-pam
-sudo
-systemd-libs
-util-linux-core
-zlib
+zlib-ng-compat

This adds gzip and sudo back to the non-minimal container, as well as
bzip2, xz, and zstd to round out the set of [de]compression tools.
---
 teams/cloud/container.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml
index b4770db..f9238ec 100644
--- a/teams/cloud/container.xml
+++ b/teams/cloud/container.xml
@@ -127,6 +127,9 @@
 	<packages type="bootstrap" profiles="Container-Base-Generic">
 		<ignore name="glibc-langpack-en"/>
 		<ignore name="langpacks-en"/>
+		<package name="bzip2"/>
+		<package name="gzip"/>
+		<package name="sudo"/>
 		<package name="rootfiles"/>
 		<package name="tar"/> <!-- https://bugzilla.redhat.com/show_bug.cgi?id=1409920 -->
 		<package name="vim-minimal"/>
@@ -134,6 +137,8 @@
 		<package name="dnf-yum"/> <!-- https://pagure.io/fesco/issue/1312#comment-30991 -->
 		<package name="glibc-minimal-langpack"/>
 		<package name="tzdata"/>
+		<package name="xz"/>
+		<package name="zstd"/>
 	</packages>
 	<packages type="bootstrap" patternType="plusRecommended" profiles="Container-Toolbox">
 		<ignore name="dosfstools"/>
-- 
cgit v1.3.1+13