ociTools: various improvements #130061
Closed
ociTools: various improvements #130061
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
/nix/store/<hash>-join does not say much, unfortunately
mikroskeem
commented
Jul 13, 2021
Comment on lines
+3
to
+7
| let | ||
| currentSystemSplit = lib.splitString "-" builtins.currentSystem; | ||
| currentOS = lib.last currentSystemSplit; | ||
| currentArch = lib.head currentSystemSplit; | ||
| in |
There was a problem hiding this comment.
I am pretty sure that there's better way...
There was a problem hiding this comment.
Avoid builtins.currentSystem. A drop-in is hostPlatform.system, but you probably want something like hostPlatform.parsed.cpu.name and hostPlatform.parsed.kernel.name.
Seems to match at least for x86-64 and for linux, but I don't know what format buildContainer really needs.
|
I marked this as stale due to inactivity. → More info |
stale
bot
added
the
2.status: stale
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.
Motivation for this change
Turns out that ociTools has been broken since the day it was introduced -
realatimeis incorrect mount option, making none of the OCI-compatible runtimes accept the bundle generated using it.This PR also introduces a way to specify extra OCI configuration to be merged into bundle's
config.json, and makes a minor adjustment to finalrunCommandstep to set image derivation output name which makes more sense.Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)