From 14982aeb7b4f4e7e585da31b785fee5d6160f7c0 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 3 May 2023 13:01:55 -0400 Subject: [PATCH] Bump to Fedora 38 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. --- Dockerfile | 2 +- build.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 01136c856e..6ff1bff56d 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 registry.fedoraproject.org/fedora:37 +FROM registry.fedoraproject.org/fedora:38 WORKDIR /root/containerbuild # Keep this Dockerfile idempotent for local development rebuild use cases. diff --git a/build.sh b/build.sh index 13a404df02..8dd1066f32 100755 --- a/build.sh +++ b/build.sh @@ -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