Skip to content

Commit

Permalink
Bump to Fedora 40
Browse files Browse the repository at this point in the history
Some of our upstream CIs (ostree, rpm-ostree) require cosa and FCOS to
be on the same release. Ideally we'd fix that but there's details there
and we want to move cosa anyway.
  • Loading branch information
jlebon committed May 1, 2024
1 parent d0fc725 commit 65a1155
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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:39
FROM quay.io/fedora/fedora:40
WORKDIR /root/containerbuild

# Keep this Dockerfile idempotent for local development rebuild use cases.
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ install_rpms() {
frozendeps=""

# We freeze the version for now since we're carrying patches.
frozendeps+=" $(echo osbuild{,-ostree,-selinux,-tools}-114-1.fc39.noarch)"
frozendeps+=" $(echo osbuild{,-ostree,-selinux,-tools}-114-1.fc40.noarch)"

# First, a general update; this is best practice. We also hit an issue recently
# where qemu implicitly depended on an updated libusbx but didn't have a versioned
Expand Down
4 changes: 2 additions & 2 deletions tests/containers/tang/Containerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM registry.fedoraproject.org/fedora-minimal:39
FROM registry.fedoraproject.org/fedora-minimal:40

RUN microdnf -y install tang && microdnf clean all && rm -rf /var/cache/yum
EXPOSE 80

RUN systemctl enable tangd.socket

CMD ["/sbin/init"]
CMD ["/sbin/init"]

0 comments on commit 65a1155

Please sign in to comment.