diff options
| author | Robert K. Bell <robert.k.bell@gmail.com> | 2023-12-04 14:39:18 +1100 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2024-02-14 22:39:15 +0000 |
| commit | 630a4058f19f08870ddfc1a568b934e98f0812f4 (patch) | |
| tree | a85a67f774d07afea500fe68fa3cbb0dd89bbd9c /pkgs/build-support | |
| parent | 058336b2b3a1cfef76fa84487aca3f4def26cf2d (diff) | |
nixos/dockerTools: fix includeStorePaths when enableFakechroot
After #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. (cherry picked from commit 8353fad13da8983b95c47426a355e044099cee91)
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 23e439c6c423b..99dc59fa46663 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -922,6 +922,7 @@ rec { --sort name \ --exclude=./proc \ --exclude=./sys \ + --exclude=.${builtins.storeDir} \ --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ --hard-dereference \ -cf $out/layer.tar . diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 5784e650dc2e4..109bea54ec0c9 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -637,6 +637,7 @@ rec { ]; config.Cmd = [ "hello" ]; includeStorePaths = false; + enableFakechroot = true; }; etc = |