Skip to content

images/server: Few improvements to install-packages.sh #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2025
Merged

images/server: Few improvements to install-packages.sh #206

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions images/server/install-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ get_samba_nightly_repo() {
get_distro_ceph_repo() {
if [[ "${OS_BASE}" = centos ]]; then
dnf install --setopt=install_weak_deps=False -y \
centos-release-ceph-reef
centos-release-ceph-squid
fi
}

Expand All @@ -74,38 +74,41 @@ package_selection="$4"
# shellcheck disable=SC1091
OS_BASE="$(. /etc/os-release && echo "${ID}")"

get_epel_repo_if_needed

case "${install_packages_from}" in
samba-nightly)
get_samba_nightly_repo
get_distro_ceph_repo
get_epel_repo_if_needed
package_selection=${package_selection:-nightly}
;;
devbuilds)
get_samba_nightly_repo
# devbuilds - samba nightly dev builds and ceph dev builds
get_ceph_shaman_repo
get_epel_repo_if_needed
package_selection=${package_selection:-devbuilds}
;;
custom-repo)
get_custom_repo "${install_custom_repo}"
get_distro_ceph_repo
get_epel_repo_if_needed
package_selection=${package_selection:-custom}
;;
custom-devbuilds)
get_custom_repo "${install_custom_repo}"
get_ceph_shaman_repo
get_epel_repo_if_needed
package_selection=${package_selection:-devbuilds}
package_selection=${package_selection:-custom-devbuilds}
;;
*)
get_distro_ceph_repo
package_selection=${package_selection:-default}
;;
esac


dnf_cmd=(dnf)
if [[ "${OS_BASE}" = centos ]]; then
dnf_cmd+=(--enablerepo=crb)
if [[ "${package_selection}" != "nightly" && "${package_selection}" != "devbuilds" ]]; then
if [[ "${package_selection}" = "default" ]]; then
dnf_cmd+=(--enablerepo=resilientstorage)
fi
fi
Expand All @@ -132,7 +135,7 @@ case "${package_selection}-${OS_BASE}" in
*-fedora|allvfs-*)
samba_packages+=(samba-vfs-cephfs samba-vfs-glusterfs ctdb-ceph-mutex)
;;
devbuilds-centos|forcedevbuilds-*)
*devbuilds-centos|forcedevbuilds-*)
# Enable libcephfs proxy for dev builds
support_packages+=(libcephfs-proxy2)
# Fall through to next case
Expand Down