Skip to content

Commit

Permalink
Merge pull request #450 from thaJeztah/remove_dnf5_workaround
Browse files Browse the repository at this point in the history
Remove workaround for dnf5 addrepo bug
  • Loading branch information
thaJeztah authored Nov 5, 2024
2 parents 6d51e2c + c8e03d7 commit 711a0d4
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -558,15 +558,8 @@ do_install() {
set -x
fi
if command_exists dnf5; then
# $sh_c "dnf -y -q --setopt=install_weak_deps=False install dnf-plugins-core"
# $sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --from-repofile='$repo_file_url'"

$sh_c "dnf -y -q --setopt=install_weak_deps=False install curl dnf-plugins-core"
# FIXME(thaJeztah); strip empty lines as workaround for https://github.com/rpm-software-management/dnf5/issues/1603
TMP_REPO_FILE="$(mktemp --dry-run)"
$sh_c "curl -fsSL '$repo_file_url' | tr -s '\n' > '${TMP_REPO_FILE}'"
$sh_c "dnf5 config-manager addrepo --save-filename=docker-ce.repo --overwrite --from-repofile='${TMP_REPO_FILE}'"
$sh_c "rm -f '${TMP_REPO_FILE}'"
$sh_c "dnf -y -q --setopt=install_weak_deps=False 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 "dnf5 config-manager setopt \"docker-ce-*.enabled=0\""
Expand Down

0 comments on commit 711a0d4

Please sign in to comment.