Skip to content

Commit 8b34f1a

Browse files
committed
Bump to Fedora 41
F41 is out let's update COSA to be based on Fedora 41.
1 parent f529f73 commit 8b34f1a

7 files changed

+7
-341
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# When rebasing to new Fedora, also update openshift/release:
22
# https://github.com/openshift/release/tree/master/ci-operator/config/coreos/coreos-assembler/coreos-coreos-assembler-main.yaml
3-
FROM quay.io/fedora/fedora:40
3+
FROM quay.io/fedora/fedora:41
44
WORKDIR /root/containerbuild
55

66
# Keep this Dockerfile idempotent for local development rebuild use cases.

build.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,21 +168,18 @@ patch_osbuild() {
168168
# To make it easier to apply patches we'll move around the osbuild
169169
# code on the system first:
170170
rmdir /usr/lib/osbuild/osbuild
171-
mv /usr/lib/python3.12/site-packages/osbuild /usr/lib/osbuild/
171+
mv /usr/lib/python3.13/site-packages/osbuild /usr/lib/osbuild/
172172
mkdir /usr/lib/osbuild/tools
173173
mv /usr/bin/osbuild-mpp /usr/lib/osbuild/tools/
174174

175175
# Now all the software is under the /usr/lib/osbuild dir and we can patch
176-
cat /usr/lib/coreos-assembler/0001-parsing-add-parse_location_into_parts.patch \
177-
/usr/lib/coreos-assembler/0002-parsing-treat-locations-without-scheme-as-belonging-.patch \
178-
/usr/lib/coreos-assembler/0003-org.osbuild.selinux-support-operating-on-mounts.patch \
179-
/usr/lib/coreos-assembler/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch \
176+
cat foo.patch \
180177
| patch -d /usr/lib/osbuild -p1
181178

182179
# And then move the files back; supermin appliance creation will need it back
183180
# in the places delivered by the RPM.
184181
mv /usr/lib/osbuild/tools/osbuild-mpp /usr/bin/osbuild-mpp
185-
mv /usr/lib/osbuild/osbuild /usr/lib/python3.12/site-packages/osbuild
182+
mv /usr/lib/osbuild/osbuild /usr/lib/python3.13/site-packages/osbuild
186183
mkdir /usr/lib/osbuild/osbuild
187184
}
188185

@@ -200,5 +197,5 @@ else
200197
install_ocp_tools
201198
trust_redhat_gpg_keys
202199
configure_user
203-
patch_osbuild
200+
#patch_osbuild
204201
fi

src/0001-parsing-add-parse_location_into_parts.patch

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/0002-parsing-treat-locations-without-scheme-as-belonging-.patch

Lines changed: 0 additions & 55 deletions
This file was deleted.

src/0003-org.osbuild.selinux-support-operating-on-mounts.patch

Lines changed: 0 additions & 116 deletions
This file was deleted.

src/0004-org.osbuild.selinux-support-for-specifying-where-fil.patch

Lines changed: 0 additions & 92 deletions
This file was deleted.

tests/containers/tang/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM registry.fedoraproject.org/fedora-minimal:40
1+
FROM registry.fedoraproject.org/fedora-minimal:41
22

3-
RUN microdnf -y install tang && microdnf clean all && rm -rf /var/cache/yum
3+
RUN dnf -y install tang && dnf clean all && rm -rf /var/cache/yum
44
EXPOSE 80
55

66
RUN systemctl enable tangd.socket

0 commit comments

Comments
 (0)