-
-
Notifications
You must be signed in to change notification settings - Fork 15.5k
Use closureInfo for building system tarballs and Docker container #49855
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
I think this PR at least partially overlaps with #49414 |
Ah, I just saw docker image and closureinfo were mentioned both places :) So this is good to go in your opinion, then? |
@@ -14,8 +13,6 @@ stripSlash() { | |||
if test "${res:0:1}" = /; then res=${res:1}; fi | |||
} | |||
|
|||
touch pathlist |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you know why this was there?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Original nixos/lib/make-system-tarball.sh
does not have any further reference to pathlist
. However, I have a theory that this script could have been written in tandem with make-iso9660-image.sh
, since the function names and variables are very similar.
@dingxiangfei2009 It seems there are some changes that are not related to the commit message (the Docker FS layout for instance). This makes your commit harder to review.
|
@nlewo
Then running CD/DVD builds are still working. In fact, currently only the Docker profile uses |
Have you also booted into the resulting dvd? Maybe one our tests covers that. |
You example is useful. I added it to the module itself. |
@Mic92 Yes. I built a |
Motivation for this change
Since
nix
2.0 is available, we can populate the nix store in the tarball with proper hashes. With these changes, building docker image is updated.Note that previously the docker image does not contain the complete filesystem layout. Now the full filesystem is copied over.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
)nix path-info -S
before and after)