Skip to content

Commit

Permalink
Bump to Fedora 38
Browse files Browse the repository at this point in the history
We still need the grub2 pin for the ppc64le issue:
https://bugzilla.redhat.com/show_bug.cgi?id=2173015

Update it to use the latest working f38 build.
  • Loading branch information
jlebon authored and dustymabe committed May 5, 2023
1 parent 3d95dbe commit 14982ae
Show file tree
Hide file tree
Showing 2 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 registry.fedoraproject.org/fedora:37
FROM registry.fedoraproject.org/fedora:38
WORKDIR /root/containerbuild

# Keep this Dockerfile idempotent for local development rebuild use cases.
Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ install_rpms() {

# freeze grub2 for https://github.com/coreos/coreos-assembler/issues/3370
case "${arch}" in
x86_64) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,efi-x64,pc,pc-modules}-1:2.06-75.fc37);;
aarch64) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,efi-aa64}-1:2.06-75.fc37);;
ppc64le) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,ppc64le,ppc64le-modules}-1:2.06-75.fc37);;
x86_64) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,efi-x64,pc,pc-modules}-1:2.06-76.fc38);;
aarch64) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,efi-aa64}-1:2.06-76.fc38);;
ppc64le) frozendeps=$(echo grub2-{common,tools,tools-extra,tools-minimal,ppc64le,ppc64le-modules}-1:2.06-76.fc38);;
*) ;;
esac

Expand Down

0 comments on commit 14982ae

Please sign in to comment.