Skip to content

Commit

Permalink
install_rpm_containerd: add workaround for dnf5 addrepo bug
Browse files Browse the repository at this point in the history
The addrepo command has a bug that causes it to fail if the `.repo` file
contains empty lines, causing it to fail;

    dnf config-manager addrepo --from-repofile="https://download.docker.com/linux/fedora/docker-ce.repo"
    Error in added repository configuration file. Cannot set repository option "docker#1=
    ": Option "docker#1" not found

Use a temporary file and strip empty lines as a workaround until the bug
is fixed.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
  • Loading branch information
thaJeztah committed Sep 4, 2024
1 parent 3fdf261 commit f43b3cf
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion install-containerd-helpers
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,12 @@ function install_rpm_containerd() {
if command -v dnf5; then
dnf --version

dnf config-manager addrepo --save-filename=docker-ce.repo --from-repofile="${REPO_URL}"
# FIXME(thaJeztah); strip empty lines as workaround for https://github.com/rpm-software-management/dnf5/issues/1603
TMP_REPO_FILE="$(mktemp --dry-run)"
curl -fsSL "${REPO_URL}" | tr -s '\n' > "${TMP_REPO_FILE}"
dnf config-manager addrepo --save-filename=docker-ce.repo --overwrite --from-repofile="${TMP_REPO_FILE}"
rm -f "${TMP_REPO_FILE}"
# dnf config-manager addrepo --save-filename=docker-ce.repo --from-repofile="${REPO_URL}"
dnf config-manager setopt 'docker-ce-*.enabled=0'
dnf config-manager setopt 'docker-ce-test.enabled=1'
dnf makecache
Expand Down

0 comments on commit f43b3cf

Please sign in to comment.