From 22ad55bcaf04786890a6ce9f6babb61cdf4bc8c0 Mon Sep 17 00:00:00 2001 From: gursewak1997 Date: Mon, 25 Nov 2024 15:05:44 -0800 Subject: [PATCH] Bump to Fedora 41 F41 is out let's update COSA to be based on Fedora 41. --- Dockerfile | 2 +- build.sh | 4 ++-- tests/containers/tang/Containerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 146d2cba3e..57037791a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # When rebasing to new Fedora, also update openshift/release: # https://github.com/openshift/release/tree/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml -FROM quay.io/fedora/fedora:40 +FROM quay.io/fedora/fedora:41 WORKDIR /root/containerbuild # Keep this Dockerfile idempotent for local development rebuild use cases. diff --git a/build.sh b/build.sh index 5752c4edd1..a214c02474 100755 --- a/build.sh +++ b/build.sh @@ -168,7 +168,7 @@ patch_osbuild() { # To make it easier to apply patches we'll move around the osbuild # code on the system first: rmdir /usr/lib/osbuild/osbuild - mv /usr/lib/python3.12/site-packages/osbuild /usr/lib/osbuild/ + mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/ mkdir /usr/lib/osbuild/tools mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/ @@ -182,7 +182,7 @@ patch_osbuild() { # And then move the files back; supermin appliance creation will need it back # in the places delivered by the RPM. mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp - mv /usr/lib/osbuild/osbuild /usr/lib/python3.12/site-packages/osbuild + mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild mkdir /usr/lib/osbuild/osbuild } diff --git a/tests/containers/tang/Containerfile b/tests/containers/tang/Containerfile index f36fe9132c..40b3eea3ab 100644 --- a/tests/containers/tang/Containerfile +++ b/tests/containers/tang/Containerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora-minimal:40 +FROM registry.fedoraproject.org/fedora-minimal:41 RUN microdnf -y install tang && microdnf clean all && rm -rf /var/cache/yum EXPOSE 80