🐛 Fix +base-image for Remote Execution #2808
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This does not work with remote execution today. For example, if I made
a new `Earthfile` in a different repository that contained this:
```yaml
kairos-image:
BUILD github.com/kairos-io/kairos:3.1.1+base-image \
--BASE_IMAGE=ubuntu:24.04 \
--BOOTLOADER=grub \
--FAMILY=ubuntu \
--FLAVOR=ubuntu \
--FLAVOR_RELEASE=24.04 \
--MODEL=generic \
--VARIANT=standard
```
It will fail to build with:
```
g/k/kairos:v3.1.1+base-image | resolve build context for dockerfile: read build file: open images/+kairos-dockerfile/Dockerfile: no such file or directory
Error: async earthfile2llb for github.com/kairos-io/kairos:v3.1.1+base-image: /tmp/earthly-git3649441421/Earthfile:263:4 from dockerfile: resolve build context for dockerfile: read build file: open images/+kairos-dockerfile/Dockerfile: no such file or directory
in github.com/kairos-io/kairos:v3.1.1+base-image --BASE_IMAGE=ghcr.io/marinatedconcrete/ubuntu-24-lts:latest --BOOTLOADER=grub --FAMILY=ubuntu --FLAVOR=ubuntu --FLAVOR_RELEASE=24.04 --FRAMEWORK_VERSION= --K3S_VERSION= --MODEL=generic --RELEASE= --SOFTWARE_VERSION_PREFIX= --TARGETARCH= --VARIANT=standard --_FRAMEWORK_VERSION= --_SOFTWARE_LUET_VERSION=
```
This change fixes it by using a saved artifact instead of directly
copying referencing the relative path. This also aligns better with the
Earthly docs: https://docs.earthly.dev/docs/earthfile#from-dockerfile
Signed-off-by: Shawn Wilsher <[email protected]>
sdwilsh
force-pushed
the
fix-earthly-remote-invocation
branch
from
05c9175
to
6171a99
Compare
sdwilsh
referenced
this pull request
in marinatedconcrete/config
Aug 31, 2024
This PR contains the following updates: | Package | Update | Change | |---|---|---| | [kairos-io/kairos](https://togithub.com/kairos-io/kairos) | minor | `v3.0.14` -> `v3.1.2` | --- > [!WARNING] > Some dependencies could not be looked up. Check the Dependency Dashboard for more information. --- ### Release Notes <details> <summary>kairos-io/kairos (kairos-io/kairos)</summary> ### [`v3.1.2`](https://togithub.com/kairos-io/kairos/releases/tag/v3.1.2) [Compare Source](https://togithub.com/kairos-io/kairos/compare/v3.1.1...v3.1.2) ####⚠️ The following issues have been resolved, so it is safe to upgrade again: Kairos user ids change on upgrade, breaking ssh login [#​2797](https://togithub.com/kairos-io/kairos/issues/2797) Long duration hang during boot [#​2802](https://togithub.com/kairos-io/kairos/issues/2802) #### What's Changed - 🤖 Check that install/recovery services are off during active boot by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2775](https://togithub.com/kairos-io/kairos/pull/2775) - 🐧 Disable pcrlock for all systemd distros by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2778](https://togithub.com/kairos-io/kairos/pull/2778) - 🐛 Empty machine-id instead of removing it by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2784](https://togithub.com/kairos-io/kairos/pull/2784) - 🐛 Fix +base-image for Remote Execution by [@​sdwilsh](https://togithub.com/sdwilsh) in [https://github.com/kairos-io/kairos/pull/2808](https://togithub.com/kairos-io/kairos/pull/2808) **Full Changelog**: kairos-io/kairos@v3.1.1...v3.1.2 ### [`v3.1.1`](https://togithub.com/kairos-io/kairos/releases/tag/v3.1.1) [Compare Source](https://togithub.com/kairos-io/kairos/compare/v3.1.0...v3.1.1) ### Upgrade issues Be advised that there is currently an issue when upgrading from 3.0.x to 3.1.x in which the user ids will change. This will result in any files owned by the user under its /home directory to lose permissions which can lead to not being able to ssh (ssh keys will have a different user id) We are currently working on a workaround, so you are advised to not upgrade until 3.1.2 is released with a fix for this. #### What's Changed Bug fixes 🐛 - Disable make cache timer on fedora by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2717](https://togithub.com/kairos-io/kairos/pull/2717) - It's not possible to login on an Alpine 3.19 RPi fixed by [@​Itxaka](https://togithub.com/Itxaka) [#​2439](https://togithub.com/kairos-io/kairos/issues/2439) - Expired password on system with no rtc (e.g. rpi4) on Alpine fixed by [@​Itxaka](https://togithub.com/Itxaka) [#​1994](https://togithub.com/kairos-io/kairos/issues/1994) - cgroup_memory not mounted in Alpine rpi4 fixed by [@​Itxaka](https://togithub.com/Itxaka) [#​2002](https://togithub.com/kairos-io/kairos/issues/2002) - reset from the GRUB menu on alpine, gets stuck in an endless loop [@​Itxaka](https://togithub.com/Itxaka) [#​2136](https://togithub.com/kairos-io/kairos/issues/2136) #### Known Issues - RPi EFI booting no longer supported on kernels shipped with Ubuntu 24.04+ [#​2249](https://togithub.com/kairos-io/kairos/issues/2249) **Full Changelog**: kairos-io/kairos@v3.1.0...v3.1.1 ### [`v3.1.0`](https://togithub.com/kairos-io/kairos/releases/tag/v3.1.0) [Compare Source](https://togithub.com/kairos-io/kairos/compare/v3.0.14...v3.1.0) ### Upgrade issues Be advised that there is currently an issue when upgrading from 3.0.x to 3.1.x in which the user ids will change. This will result in any files owned by the user under its /home directory to lose permissions which can lead to not being able to ssh (ssh keys will have a different user id) We are currently working on a workaround, so you are advised to not upgrade until 3.1.2 is released with a fix for this. #### Potential Breaking Changes By default, Uki artifacts (identified by the -uki suffix) no longer include Linux modules and firmware in the image. Real-world testing has shown that many EFI firmwares are very particular about the size of the EFI image, often refusing to boot if the file exceeds 300-400MB. Given the wide variety of EFI firmware implementations, predicting whether a UKI EFI file will boot on different hardware is challenging. To enhance compatibility, we decided to slim down the UKI files by removing the largest components: the Linux modules and firmware packages. This results in EFI files around 200-300MB, which are much more likely to boot correctly across various EFI implementations. However, this change comes with a trade-off. Smaller images, while being more compatible with a wide range of EFI firmwares, may lack comprehensive hardware support because they do not include all the Linux modules and firmware packages. This means that certain hardware components may not function correctly or optimally when using these slimmer UKI images. On the other hand, larger UKI images, which include all necessary modules and firmware for extensive hardware support, provide better functionality and compatibility with a broad range of hardware. However, these larger images are more likely to encounter boot issues due to EFI firmware limitations, as many EFI implementations refuse to boot files larger than 300-400MB. We publish -uki artifacts ourselves, which are the slimmed versions, as examples of how to build a slimmer UKI artifact. While these serve as a reference, we recommend always building your own custom images to tailor them to your specific hardware needs. If you need to include those packages for full hardware support, you can create a custom artifact to add them back, as detailed in the Kairos docs. We recommend keeping your UKI EFI files as small as possible to maximize boot success across different EFI firmware implementations. While smaller images offer better compatibility, they may lack full hardware support. Conversely, larger images, which include all necessary modules and firmware, provide comprehensive hardware support but may fail to boot due to EFI firmware constraints. Check out how to build your own base images with the [Kairos Factory](https://kairos.io/docs/reference/kairos-factory/) #### What's Changed 💿 UKI - UKI: measured systemd-sysext by [@​Itxaka](https://togithub.com/Itxaka) [#​2117](https://togithub.com/kairos-io/kairos/issues/2117) - UKI: Verify images signature before upgrade by [@​Itxaka](https://togithub.com/Itxaka) [#​2200](https://togithub.com/kairos-io/kairos/issues/2200) - UKI: Enroll keys during setup [#​2048](https://togithub.com/kairos-io/kairos/issues/2048) - Install limited amount of modules for UKI Ubuntu by [@​mauromorales](https://togithub.com/mauromorales) in [https://github.com/kairos-io/kairos/pull/2566](https://togithub.com/kairos-io/kairos/pull/2566) 🐧 - Support for Ubuntu 24.04 LTS by [@​mauromorales](https://togithub.com/mauromorales) [#​2138](https://togithub.com/kairos-io/kairos/issues/2138) and deprecation of 23.10 - Support for Fedora 40 by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2502](https://togithub.com/kairos-io/kairos/pull/2502) and deprecation of previous versions - refactor debian dockerfile to build arm by [@​mauromorales](https://togithub.com/mauromorales) in [https://github.com/kairos-io/kairos/pull/2542](https://togithub.com/kairos-io/kairos/pull/2542) - Bump opensuse Leap to 15.6 by [@​mauromorales](https://togithub.com/mauromorales) in [https://github.com/kairos-io/kairos/pull/2623](https://togithub.com/kairos-io/kairos/pull/2623) 🐛 - fix(nvidia): do not ship nohang in nvidia-arm builds by [@​mudler](https://togithub.com/mudler) in [https://github.com/kairos-io/kairos/pull/2433](https://togithub.com/kairos-io/kairos/pull/2433) - Allow https protocol in ipxe by [@​jimmykarily](https://togithub.com/jimmykarily) in [https://github.com/kairos-io/kairos/pull/2468](https://togithub.com/kairos-io/kairos/pull/2468) - fix(orin): disable ISCSI in the initramfs generation by [@​mudler](https://togithub.com/mudler) in [https://github.com/kairos-io/kairos/pull/2474](https://togithub.com/kairos-io/kairos/pull/2474) - 🐛 Move nfs-utils to common build target in opensuse flavor by [@​kaiehrhardt](https://togithub.com/kaiehrhardt) in [https://github.com/kairos-io/kairos/pull/2495](https://togithub.com/kairos-io/kairos/pull/2495) - 🐛 Install cryptsetup for all arches in opensuse by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2691](https://togithub.com/kairos-io/kairos/pull/2691) 📖 - 📖 chore: fix typos by [@​xiaoxianBoy](https://togithub.com/xiaoxianBoy) in [https://github.com/kairos-io/kairos/pull/2441](https://togithub.com/kairos-io/kairos/pull/2441) - readme: add links to project governance by [@​mudler](https://togithub.com/mudler) in [https://github.com/kairos-io/kairos/pull/2498](https://togithub.com/kairos-io/kairos/pull/2498) - Update LICENSE by [@​mudler](https://togithub.com/mudler) in [https://github.com/kairos-io/kairos/pull/2503](https://togithub.com/kairos-io/kairos/pull/2503) - Add OpenSSF best practices badge by [@​mauromorales](https://togithub.com/mauromorales) in [https://github.com/kairos-io/kairos/pull/2639](https://togithub.com/kairos-io/kairos/pull/2639) - Add clomonitor badge by [@​mauromorales](https://togithub.com/mauromorales) in [https://github.com/kairos-io/kairos/pull/2640](https://togithub.com/kairos-io/kairos/pull/2640) - Link to GH Security Draft Advisory form by [@​mauromorales](https://togithub.com/mauromorales) in [https://github.com/kairos-io/kairos/pull/2650](https://togithub.com/kairos-io/kairos/pull/2650) 🔧 - More options for enki outputs by [@​Itxaka](https://togithub.com/Itxaka) in [https://github.com/kairos-io/kairos/pull/2515](https://togithub.com/kairos-io/kairos/pull/2515) #### New Contributors - [@​xiaoxianBoy](https://togithub.com/xiaoxianBoy) made their first contribution in [https://github.com/kairos-io/kairos/pull/2441](https://togithub.com/kairos-io/kairos/pull/2441) **Full Changelog**: kairos-io/kairos@v3.0.14...v3.1.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/marinatedconcrete/config). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40MjUuMSIsInVwZGF0ZWRJblZlciI6IjM4LjU2LjAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbXX0=--> --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Shawn Wilsher <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This does not work with remote execution today. For example, if I made a new
Earthfilein a different repository that contained this:It will fail to build with:
This change fixes it by using a saved artifact instead of directly copying referencing the relative path. This also aligns better with the Earthly docs: https://docs.earthly.dev/docs/earthfile#from-dockerfile