Initial cleanups for #156 #157
Closed
Conversation
This file contains hidden or 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
Signed-off-by: Allison Karlitskaya <[email protected]>
Installing the build dependencies and building the tools takes a long time. Signed-off-by: Allison Karlitskaya <[email protected]>
I often disable the `rm -rf tmp` line to make iterating quicker (by removing the need to pull and write previous layers and objects) but in order for that to work you still need to delete a couple of things. Add a second line so that you can comment out the first one while you're working, like: # rm -rf tmp rm -rf tmp/efi tmp/sysroot/composefs/images Signed-off-by: Allison Karlitskaya <[email protected]>
Run the "install packages into the base image" section as the first thing that happens, before the cfsctl binary gets copied in. This means that we have to regenerate the initramfs, which is duplicated work, but it enables caching of the package installation, which takes much longer and involves downloading updated packages (which drift with time). This helps a lot with iterative local testing, and the bls images are the ones that I usually use for that. Also enable package caching for Arch and Debian by adding the appropriate bind mounts. Use `apt-get` instead of CLI-API-unstable `apt`. Use the new `kernel-install add-all` verb where applicable. Signed-off-by: Allison Karlitskaya <[email protected]>
This is a similar logic to the previous commit doing the same for bls/ but we make an additional change by installing the kernel up-front. This helps caching, of course, but it also eliminates the "missing modules" problem that required us to force the modules we needed to be present in the initramfs. This is going to be important when we start using more modules like vsock support. Signed-off-by: Allison Karlitskaya <[email protected]>
We need to avoid https://bugzilla.redhat.com/show_bug.cgi?id=2374928 but `semanage` seems to have a bug when invoked more than once in a container build, so we can't just add another invocation. Use a module instead, to workaround both issues in one go. Signed-off-by: Allison Karlitskaya <[email protected]>
We want to start running images with test.thing, so add the workarounds for improved ssh-vsock support. These are no longer necessary in arch and fedora-rawhide. Unfortunately we can't put these in common/ because it's outside of the build context. Using an extra build context also seems not to work because symlinks aren't copied properly unless it's from the primary context. Make a small fix to a comment in examples/uki/Containerfile that should have been cleaned up as part of a4cbd3e ("Update approach to handling boot resources"). Signed-off-by: Allison Karlitskaya <[email protected]>
cgwalters
approved these changes
Jul 31, 2025
|
I ended up just doing this all in #156. Without the Ubuntu image we can get that one merged now. |
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.
I'm having trouble getting #156 across the line, so let's see if CI works on the first few commits here...