images: support a package selection distinct from package sources

Previously, you could set a package source such as 'default' or
'nightly' and, along with the distro, it would enable repos and
install a certain packages based on those vars. However, there are times
when having the package selection separate from what repos are being
enabled is handy. This change adds a new variable, that is unused by
default, to directly pick what packages are selected for install.
However, by default, this is still derived from the package source
variable.

Signed-off-by: John Mulligan <[email protected]>

Author: phlogistonjohn

images/ad-server/install-packages.sh

@@ -13,6 +13,9 @@ get_custom_repo() {
 install_packages_from="$1"
 samba_version_suffix="$2"
 install_custom_repo="$3"
+# reserve package_selection. keep args consistent with server image script.
+# unused for ad image (for now)
+# package_selection="$4"
 
 # shellcheck disable=SC1091
 OS_BASE="$(. /etc/os-release && echo "${ID}")"
@@ -26,24 +29,37 @@ case "${install_packages_from}" in
     ;;
 esac
 
-dnf_cmd=(dnf)
-if [[ "${OS_BASE}" = centos ]]; then
-    dnf install -y epel-next-release
-    dnf_cmd+=(--enablerepo=crb)
-fi
 
-packages=(\
+# Assorted packages that must be installed in the container image to
+# support the functioning of the container
+support_packages=(\
     findutils \
     python-pip \
     python3-samba \
     python3-pyxattr \
     tdb-tools \
-    "samba-dc${samba_version_suffix}" \
     procps-ng \
     /usr/bin/smbclient)
+# Packages belonging to the samba install. If a samba_version_suffix is given
+# all the samba_packages must share that version
+samba_packages=(samba-dc)
+
+# Assign version suffix to samba packages
+samba_versioned_packages=()
+for p in "${samba_packages[@]}"; do
+    samba_versioned_packages+=("${p}${samba_version_suffix}")
+done
+
+dnf_cmd=(dnf)
+if [[ "${OS_BASE}" = centos ]]; then
+    dnf install -y epel-next-release
+    dnf_cmd+=(--enablerepo=crb)
+fi
+
 "${dnf_cmd[@]}" \
     install --setopt=install_weak_deps=False -y \
-    "${packages[@]}"
+    "${support_packages[@]}" \
+    "${samba_versioned_packages[@]}"
 dnf clean all
 
 rm -rf /etc/samba/smb.conf

images/server/install-packages.sh

@@ -13,46 +13,60 @@ get_custom_repo() {
 install_packages_from="$1"
 samba_version_suffix="$2"
 install_custom_repo="$3"
+package_selection="$4"
 
 # shellcheck disable=SC1091
 OS_BASE="$(. /etc/os-release && echo "${ID}")"
 
 case "${install_packages_from}" in
     samba-nightly)
         get_custom_repo "https://artifacts.ci.centos.org/samba/pkgs/master/${OS_BASE}/samba-nightly-master.repo"
+        package_selection=${package_selection:-nightly}
     ;;
     custom-repo)
         get_custom_repo "${install_custom_repo}"
     ;;
 esac
 
 
-dnf_cmd=(dnf)
-if [[ "${OS_BASE}" = centos ]]; then
-    dnf_cmd+=(--enablerepo=crb --enablerepo=resilientstorage)
-fi
-
-packages=(\
+# Assorted packages that must be installed in the container image to
+# support the functioning of the container
+support_packages=(\
     findutils \
     python-pip \
     python3-samba \
     python3-pyxattr \
-    "samba${samba_version_suffix}" \
-    "samba-client${samba_version_suffix}" \
-    "samba-winbind${samba_version_suffix}" \
-    "samba-winbind-clients${samba_version_suffix}" \
-    "samba-vfs-iouring${samba_version_suffix}" \
-    tdb-tools \
-    "ctdb${samba_version_suffix}")
-if [[ "${OS_BASE}" = fedora ]]; then
-    packages+=(\
-        "samba-vfs-cephfs${samba_version_suffix}" \
-        "samba-vfs-glusterfs${samba_version_suffix}" \
-    )
+    tdb-tools)
+# Packages belonging to the samba install. If a samba_version_suffix is given
+# all the samba_packages must share that version
+samba_packages=(\
+    samba \
+    samba-client \
+    samba-winbind \
+    samba-winbind-clients \
+    samba-vfs-iouring \
+    ctdb)
+case "${package_selection}-${OS_BASE}" in
+    *-fedora|allvfs-*)
+        samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs)
+    ;;
+esac
+
+# Assign version suffix to samba packages
+samba_versioned_packages=()
+for p in "${samba_packages[@]}"; do
+    samba_versioned_packages+=("${p}${samba_version_suffix}")
+done
+
+dnf_cmd=(dnf)
+if [[ "${OS_BASE}" = centos ]]; then
+    dnf_cmd+=(--enablerepo=crb --enablerepo=resilientstorage)
 fi
+
 "${dnf_cmd[@]}" \
     install --setopt=install_weak_deps=False -y \
-    "${packages[@]}"
+    "${support_packages[@]}" \
+    "${samba_versioned_packages[@]}"
 dnf clean all
 
 cp --preserve=all /etc/ctdb/functions /usr/share/ctdb/functions