Remove workaround for dnf5 addrepo bug
This reverts commit 27f47c592a
.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Родитель
6d51e2cd8c
Коммит
c8e03d723e
11
install.sh
11
install.sh
|
@ -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\""
|
||||
|
|
Загрузка…
Ссылка в новой задаче