diff --git a/Dockerfile.bls b/Dockerfile.bls index a1693562..2284acff 100644 --- a/Dockerfile.bls +++ b/Dockerfile.bls @@ -19,34 +19,10 @@ RUN --mount=type=cache,target=/build/target --mount=type=cache,target=/var/rooth make && make install-all DESTDIR=/out -# Get the latest GrubCC binary -FROM quay.io/fedora/eln:latest AS grub-cc-download -RUN --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp <&2 - exit 1 - ;; -esac - -mv ./*.rpm grub-cc.rpm - -EOF - FROM $base # Clean out the default to ensure we're using our updated content RUN rpm -e bootupd COPY --from=build /out/ / -COPY --from=grub-cc-download /grub-cc.rpm /var/grub-cc.rpm # Install bootc from copr RUN --mount=type=tmpfs,target=/run --mount=type=tmpfs,target=/tmp <&2 + exit 1 + ;; +esac + +curl --fail --location --retry 5 --retry-all-errors --retry-delay 1 \ + --output /var/grub-cc.rpm "$grub_cc_url" + # Extract and install grub-cc at the correct path mkdir /var/grub-cc rpm2archive /var/grub-cc.rpm | tar -xvz -C /var/grub-cc