Add Fedora 41 (#51)

.github/workflows/ci.yml

@@ -26,6 +26,7 @@ jobs:
           - 38-1.6
           - 39-1.5
           - 40-1.14
+          - 41-1.4
     env:
       MAKE: make FEDORA_VERSION=${{ matrix.fedora }}
     runs-on: ubuntu-latest

Dockerfile

@@ -18,9 +18,15 @@ RUN --mount=type=cache,target=/var/cache/dnf \
     squashfs-tools \
     wget \
   && dnf clean all \
-  && rm /etc/yum.repos.d/*.repo \
-  && dnf config-manager \
-    --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
+  && rm /etc/yum.repos.d/*.repo
+
+# Add docker-ce RPM repository:
+#   - Fedora <  41: dnf config-manager --add-repo URL
+#   - Fedora >= 41: dnf config-manager addrepo --from-repofile=URL
+RUN dnf config-manager \
+      --add-repo https://download.docker.com/linux/fedora/docker-ce.repo \
+  || dnf config-manager addrepo \
+      --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo
 
 COPY fedora.repo /etc/yum.repos.d/
 

entrypoint.sh

@@ -25,10 +25,14 @@ fi
 
 # Download rpms
 mkdir -p downloads
+download_opts="--skip-broken --downloaddir=downloads"
+if [ ${FEDORA_MAJOR} -ge 41 ]; then
+  # Option for dnf5
+  download_opts="--best --destdir=downloads"
+fi
 cat rpms.lock | xargs -n256 dnf download \
-  --skip-broken \
+  ${download_opts} \
   --arch=${arch} --arch=noarch \
-  --downloaddir=downloads \
   2> >(tee download.err >&2)
 
 # Remove old packages

fedora.pub

@@ -1,5 +1,36 @@
 # https://src.fedoraproject.org/rpms/fedora-repos
 
+# Fedora 41
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBGTSYSwBEACTHP7OFONk+1B1awJeYToUFMVbYZIjNvj9M7zwf5vzH52FlpXX
+dsbs1AWh6NUe0zV1J5JjCGiI24Vjacysg7L2zsbgT48vVv3mXrXorjYOzT/cxsAh
+7PNhEx+OevKzAx3oy0Ok27c11Dz0W4ynwVy80gB6XHI2rd04v74TiC0xQYlxj1Sh
+j6irdLmHMD/NtTCWmCM7MRf91UcC4rk6JOap715UKey2fk1h/wylv0guMP3o+CpG
+jxDHENkfl/GsWCSYBaHec7o5/qg5RoAkN5NImVI00CqiEO1WHPBaCJalgwbuQCiW
+006jwVDHJHRoufS85PEKaY9yqd5Fr76kdqCLsf3Ys9yxGVfOTvCaKOa+ElWBo+i6
+yOtEO6Qp1Qd5spomBJ+FVPjU89lR9aDnvxIVX7X6zu638qV0K3Lb2HKmqiVG6ccJ
+IdxNVXJAekvu7ypwvRzEc0mGgfkZ47flaj7X8SxiebbXhYWdqRBF0rMYc7ppkbCp
+5NsD+KJilkfeOGb7VK6Rx5vXmySiNCb9GqN51KRl4Z1qllrc/Q1k5CCMt3AUq0hv
+1fwK3eFGtd4/YgF9LoZ0tW8WFZ6h/zWnRvJ/SDBPhtovoSpxptCd18MWiakwvwW0
+sxueKFlctdDjW1a/gri3V4RdTOZbr0AqDjGGcYndt/oxMeLxaK9qvs2xIQARAQAB
+tDFGZWRvcmEgKDQxKSA8ZmVkb3JhLTQxLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEERmzy2LYLwwV6qUU+0GIkYumdatEFAmTSYSwCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ0GIkYumdatFHIQ//bTSVGDvJGmUxgHJw
+MnGM2G6Rc9PNAKuXbh6t4qsrRKp22pWNnMmqqcGaoiBxKP989a2cJgIVP49SsC4C
+ewaafEYhsitUtKagx6z3F7UObnvQpOz5U5iFcJCvRDtC4FXq+VkMdhT09zMZY4Ey
+ia29bV1B1R7pe7yXh6l3WyVj9AAXUSEBR/OsakaYEMzScLnROBEU1YbWR9iHsc7M
+rEsqju8tVUh1XAqIqJgLW3VrKs0g0nDVR0rBc8aDhrtVfylwWVl61gHsPFJfAkjj
+OPgvQgThrhlCWo23EZSk/Hj8YRrnhUbEDnk+Z3Xv5Uyl1kxGRk5dGBnv+7u3CKvV
+G6sU3tPtna/8rFblfKSMZIPhzTADdsUZ88Fn9pZkfqgPi8LZ4sS8vHtaykZmbfj6
+t9a2mBYJQ+/pxiH8olzyhKMdNyesLPeQmESgwM/qlJ+b2Hbogwuuzp8o2JMezxIe
+CAwLoPh+hxMPGnBRklh6Vj5R5z29wIZd6pKCavVRfJ+ON94wuOSEofhBfQNZIIFV
+jagEbk60iksysxsObfVEHFhtGnZCEgCRC87BfX6tzIIDv23Zs4Bv9gcaaRXTAml2
+kZXktduHkV9q3hhcoha5FgGSe244C4GsMUkWCsZtuN6tevUPo+n2ZZAA7ikQ768r
+Iz9rPOI8/Ra7qnwSlNIVnkTb9bc=
+=e2ew
+-----END PGP PUBLIC KEY BLOCK-----
+
 # Fedora 40
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 

updater.Dockerfile

@@ -9,9 +9,15 @@ RUN --mount=type=cache,target=/var/cache/dnf \
     findutils \
     make \
   && dnf clean all \
-  && rm /etc/yum.repos.d/*.repo \
-  && dnf config-manager \
-    --add-repo https://download.docker.com/linux/fedora/docker-ce.repo
+  && rm /etc/yum.repos.d/*.repo
+
+# Add docker-ce RPM repository:
+#   - Fedora <  41: dnf config-manager --add-repo URL
+#   - Fedora >= 41: dnf config-manager addrepo --from-repofile=URL
+RUN dnf config-manager \
+      --add-repo https://download.docker.com/linux/fedora/docker-ce.repo \
+  || dnf config-manager addrepo \
+      --from-repofile=https://download.docker.com/linux/fedora/docker-ce.repo
 
 COPY fedora.repo /etc/yum.repos.d/
 RUN sed '/fastestmirror=/d' -i /etc/yum.repos.d/fedora.repo