Skip to content

Commit

Permalink
fix: revert "feat: [NODE-1521] Move bootloader off dockerhub (#2475)" (
Browse files Browse the repository at this point in the history
…#2506)

This reverts commit c582bfe because it
breaks the hourly `//rs/tests/nested:...` system-tests since the
`host-1` VM gets stuck on grub:


https://farm.dfinity.systems/group/registration--1731006619504/vm/host-1/console/
![Screenshot 2024-11-08 at 11 05
52](https://github.com/user-attachments/assets/e03ecb7a-39f4-4149-83a9-03213e90390d)

This is likely caused by
[using](c582bfe#diff-6580a63795796c85f6d7ac9b194b7543ce61bed207dad770e648fa53bef72ad1R1)
`$fw_path` in `grub.cfg`.

Schedule Hourly on this branch:
https://github.com/dfinity/ic/actions/runs/11739921391
  • Loading branch information
basvandijk authored Nov 8, 2024
1 parent b1c0f8c commit fc375b1
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/container-mirror-images.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@
"repo": "docker.io",
"sha256": "965fbcae990b0467ed5657caceaec165018ef44a4d2d46c7cdea80a9dff0d1ea"
},
{
"image": "library/ubuntu",
"repo": "docker.io",
"sha256": "5d070ad5f7fe63623cbb99b4fc0fd997f5591303d4b03ccce50f403957d0ddc4"
},
{
"image": "ryantk/minica",
"repo": "docker.io",
Expand Down
3 changes: 1 addition & 2 deletions ic-os/bootloader/build-bootloader-tree.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ sudo mount -t tmpfs tmpfs-podman "${TMPFS}"
trap 'rm -rf "${TMPDIR}"; sudo podman --root "${TMPFS}" rm -f "${CONTAINER}"' exit
TMPDIR=$(mktemp -d -t build-image-XXXXXXXXXXXX)

BASE_IMAGE="ghcr.io/dfinity/library/ubuntu@sha256:5d070ad5f7fe63623cbb99b4fc0fd997f5591303d4b03ccce50f403957d0ddc4"
BASE_IMAGE="docker.io/dfinity/ic-build-bazel@sha256:1978886cfda51b09057bffd60f2e5edb588c6c0b74de87696cd4e964335dba87"

sudo podman --root "${TMPFS}" build --iidfile ${TMPDIR}/iidfile - <<<"
FROM $BASE_IMAGE
USER root:root
RUN apt-get -y update && apt-get -y --no-install-recommends install grub-efi faketime
RUN mkdir -p /build/boot/grub
RUN cp -r /usr/lib/grub/x86_64-efi /build/boot/grub
RUN mkdir -p /build/boot/efi/EFI/Boot
Expand Down
2 changes: 1 addition & 1 deletion ic-os/bootloader/grub.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
regexp -s boot_disk '^\(([a-z0-9]*),[a-z0-9]*\)/EFI/BOOT' $fw_path
regexp -s boot_disk '^\(([a-z0-9]*),[a-z0-9]*\)/EFI/BOOT' $cmdpath

set prefix=($boot_disk,gpt2)

Expand Down

0 comments on commit fc375b1

Please sign in to comment.