From 0392e6fcc758d5b64f679686d54db2b250eb6a4a Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Wed, 4 Sep 2024 14:31:42 -0600 Subject: [PATCH 1/2] Revert "extensions/Dockerfile: use latest Fedora to generate repo" A `fedora-archive.repo` file will now be used by older branches using EOL fedora container versions[1]. This now acts as our mechanism for handling the situation where the EOL Fedora content actually moves to a different location by pointing to the archived content directly. The `fedora-archive.repo` file in the testing-devel branch will be curled during the container setup instead of the `fedora.repo` file when the version goes EOL. This does mean we'll still have to maintain this container setup by updating the curl command as the versions go EOL around each new release. This reverts commit 94dfed82c7882276e4e7d07d94aa519a9a037988. [1] https://github.com/coreos/fedora-coreos-config/pull/3128 --- extensions/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/Dockerfile b/extensions/Dockerfile index f1430c0c2..c6fdc1c37 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -22,7 +22,7 @@ RUN if [[ -n "${VARIANT}" ]]; then MANIFEST="manifest-${VARIANT}.yaml"; EXTENSIO ## Creates the repo metadata for the extensions. ## This uses Fedora as a lowest-common-denominator because it will work on ## current p8/s390x. See https://github.com/openshift/os/issues/1000 -FROM quay.io/fedora/fedora:latest as builder +FROM quay.io/fedora/fedora:40 as builder COPY --from=os /usr/share/rpm-ostree/extensions/ /usr/share/rpm-ostree/extensions/ RUN rm -f /etc/yum.repos.d/*.repo \ && curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora.repo -o /etc/yum.repos.d/fedora.repo From 51d07e838d1c55e4f64cb6446173f543b3383865 Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Fri, 6 Sep 2024 10:18:47 -0600 Subject: [PATCH 2/2] extensions/Dockerfile: use fedora-archive.repo to set up container The `fedora-archive.repo` file now contains both EOL and non-EOL repo locations[1]. This means we can change the extensions container, which uses the fedora container, to utilize `fedora-archive.repo` as the only repo configuration file. This reduces the maintenance burden because now we don't have to change this curl statement when fedora versions reach EOL. [1] https://github.com/coreos/fedora-coreos-config/pull/3145 --- extensions/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/Dockerfile b/extensions/Dockerfile index c6fdc1c37..d2e0b5403 100644 --- a/extensions/Dockerfile +++ b/extensions/Dockerfile @@ -25,7 +25,7 @@ RUN if [[ -n "${VARIANT}" ]]; then MANIFEST="manifest-${VARIANT}.yaml"; EXTENSIO FROM quay.io/fedora/fedora:40 as builder COPY --from=os /usr/share/rpm-ostree/extensions/ /usr/share/rpm-ostree/extensions/ RUN rm -f /etc/yum.repos.d/*.repo \ -&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora.repo -o /etc/yum.repos.d/fedora.repo +&& curl -L https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-archive.repo -o /etc/yum.repos.d/fedora-archive.repo RUN dnf install -y createrepo_c RUN createrepo_c /usr/share/rpm-ostree/extensions/