nixos/dockerTools: fix includeStorePaths when enableFakechroot #271976
Conversation
ofborg
bot
added
10.rebuild-darwin: 0
| @@ -922,6 +922,7 @@ rec { | |||
| --sort name \ | |||
| --exclude=./proc \ | |||
| --exclude=./sys \ | |||
| ${optionalString (!includeStorePaths) "--exclude=.${builtins.storeDir}"} \ | |||
There was a problem hiding this comment.
Store paths should under no circumstance be added to the customization layer. That's what the other layers are for.
| ${optionalString (!includeStorePaths) "--exclude=.${builtins.storeDir}"} \ | |
| --exclude=.${builtins.storeDir} \ |
There was a problem hiding this comment.
Thanks for the tip! I've amended my commit to: f09b8484b3604beeaafae15c4e3d1170175da126 9be14e2f323c56c57e4fb034dd73720358370b84
About the nixos tests, I'm new to them; I'll try to add them this week.
There was a problem hiding this comment.
I've added a test, and fixed my breaking typo.
Hopefully the use of pkgs.crane in the tests is ok, I had trouble finding a concise way of listing out the image files.
r-k-b
force-pushed
the
fix-dockerTools-includeStorePaths
branch
2 times, most recently
from
f09b848 to
9be14e2
Compare
github-actions
bot
added
the
6.topic: nixos
r-k-b
force-pushed
the
fix-dockerTools-includeStorePaths
branch
from
9be14e2 to
22ee6de
Compare
After NixOS#268458, when setting `enableFakechroot = true` and `includeStorePaths = false`, some of the store paths were getting included into the image anyway, thru `bind-paths`. This resulted in unexpectedly large images. Now, the images will not contain any store paths under those circumstances.
r-k-b
force-pushed
the
fix-dockerTools-includeStorePaths
branch
from
22ee6de to
8353fad
Compare
|
I've added added a few test cases so that the @ofborg test docker-tools |
|
@roberth Kind ping, I think this is ready to go in. |
|
@WxNzEMof thanks! |
|
Successfully created backport PR for |
Description of changes
After #268458, when setting
enableFakechroot = trueandincludeStorePaths = false, some of the store paths were getting included into the image anyway, thrubind-paths. This resulted in unexpectedly large images.Now, the images will not contain any store paths under those circumstances.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.