From b9824740ec430eb2ac19963cb53d54778cf542d7 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 4 Sep 2024 16:24:26 +0200 Subject: [PATCH] add support for dnf5 Fedora 41 and up use the new dnf5 as default, which is a rewrite of the dnf commands with different options; + dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo Unknown argument "--add-repo" for command "config-manager". Add "--help" for more information about the arguments. make: *** [Makefile:95: verify] Error 2 script returned exit code 2 This patch: - adds a check for dnf5 - removes some indirection through env-vars, and instead inlines the code Note that with CentOS 7 being EOL, we can probably remove the `yum` variant from the script, but I left those in place for now. Signed-off-by: Sebastiaan van Stijn --- install.sh | 65 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/install.sh b/install.sh index 1f9f506..4229ea9 100755 --- a/install.sh +++ b/install.sh @@ -552,46 +552,57 @@ do_install() { exit 0 ;; centos|fedora|rhel) - if command_exists dnf; then - pkg_manager="dnf" - pkg_manager_flags="-y -q --best" - config_manager="dnf config-manager" - enable_channel_flag="--set-enabled" - disable_channel_flag="--set-disabled" - pre_reqs="dnf-plugins-core" - else - pkg_manager="yum" - pkg_manager_flags="-y -q" - config_manager="yum-config-manager" - enable_channel_flag="--enable" - disable_channel_flag="--disable" - pre_reqs="yum-utils" - fi - - if [ "$lsb_dist" = "fedora" ]; then - pkg_suffix="fc$dist_version" - else - pkg_suffix="el" - fi repo_file_url="$DOWNLOAD_URL/linux/$lsb_dist/$REPO_FILE" ( if ! is_dry_run; then set -x fi - $sh_c "$pkg_manager $pkg_manager_flags install $pre_reqs" - $sh_c "$config_manager --add-repo $repo_file_url" + if command_exists dnf5; then + $sh_c "dnf -y -q install dnf-plugins-core" + $sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='$repo_file_url'" - if [ "$CHANNEL" != "stable" ]; then - $sh_c "$config_manager $disable_channel_flag 'docker-ce-*'" - $sh_c "$config_manager $enable_channel_flag 'docker-ce-$CHANNEL'" + if [ "$CHANNEL" != "stable" ]; then + $sh_c "dnf5 config-manager setopt 'docker-ce-*.enabled=0'" + $sh_c "dnf5 config-manager setopt 'docker-ce-$CHANNEL.enabled=1'" + fi + $sh_c "dnf makecache" + elif command_exists dnf; then + $sh_c "dnf -y -q install dnf-plugins-core" + $sh_c "dnf config-manager --add-repo $repo_file_url" + + if [ "$CHANNEL" != "stable" ]; then + $sh_c "dnf config-manager --set-disabled 'docker-ce-*'" + $sh_c "dnf config-manager --set-enabled 'docker-ce-$CHANNEL'" + fi + $sh_c "dnf makecache" + else + $sh_c "yum -y -q install yum-utils" + $sh_c "yum config-manager --add-repo $repo_file_url" + + if [ "$CHANNEL" != "stable" ]; then + $sh_c "yum config-manager --disable 'docker-ce-*'" + $sh_c "yum config-manager --enable 'docker-ce-$CHANNEL'" + fi + $sh_c "yum makecache" fi - $sh_c "$pkg_manager makecache" ) pkg_version="" + if command_exists dnf; then + pkg_manager="dnf" + pkg_manager_flags="-y -q --best" + else + pkg_manager="yum" + pkg_manager_flags="-y -q" + fi if [ -n "$VERSION" ]; then if is_dry_run; then echo "# WARNING: VERSION pinning is not supported in DRY_RUN" else + if [ "$lsb_dist" = "fedora" ]; then + pkg_suffix="fc$dist_version" + else + pkg_suffix="el" + fi pkg_pattern="$(echo "$VERSION" | sed 's/-ce-/\\\\.ce.*/g' | sed 's/-/.*/g').*$pkg_suffix" search_command="$pkg_manager list --showduplicates docker-ce | grep '$pkg_pattern' | tail -1 | awk '{print \$2}'" pkg_version="$($sh_c "$search_command")"