diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2024-02-14 23:38:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-14 23:38:44 +0100 |
| commit | dcf985388cbb86934203217dbb60cb78f4885a54 (patch) | |
| tree | 8485089b7224f13fc2a7d8f374d19fb40389589c /pkgs/build-support/docker | |
| parent | 8affaaf9aebe9b5f4f39f8bb867c321283a237f0 (diff) | |
| parent | 1f9e86f31462b395d77151469a53543a94e46c36 (diff) | |
Merge pull request #271976 from r-k-b/fix-dockerTools-includeStorePaths
nixos/dockerTools: fix includeStorePaths when enableFakechroot
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 14 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 05a1a6fbbdaf1..3f61ecdb2a461 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -923,6 +923,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..88f36d337f253 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -639,6 +639,20 @@ rec { includeStorePaths = false; }; + helloOnRootNoStoreFakechroot = pkgs.dockerTools.streamLayeredImage { + name = "hello"; + tag = "latest"; + contents = [ + (pkgs.buildEnv { + name = "hello-root"; + paths = [ pkgs.hello ]; + }) + ]; + config.Cmd = [ "hello" ]; + includeStorePaths = false; + enableFakechroot = true; + }; + etc = let inherit (pkgs) lib; |