diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-11-20 14:55:32 +0100 |
| commit | 34b58aaefccdb5c64b912903973ba729bae58be3 (patch) | |
| tree | e18a96bc0f066422356a8da655453403baa97e64 /nixpkgs/pkgs/build-support/docker | |
| parent | 7be318098d7fe87d896e8787bfadc0345149cb59 (diff) | |
| parent | 3fb937a1e9f4157f57011965b99fcb7f4139d9ad (diff) | |
| download | nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.gz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.bz2 nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.lz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.xz nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.tar.zst nixlib-34b58aaefccdb5c64b912903973ba729bae58be3.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/build-support/docker')
| -rw-r--r-- | nixpkgs/pkgs/build-support/docker/default.nix | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 70fd3635b745..7218d67062e7 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -914,17 +914,30 @@ rec { (cd old_out; eval "$extraCommands" ) mkdir $out - ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c ' - source $stdenv/setup - ${optionalString (!enableFakechroot) ''cd old_out''} - eval "$fakeRootCommands" - tar \ - --sort name \ - --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ - --hard-dereference \ - -cf $out/layer.tar . - ' - + ${if enableFakechroot then '' + proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c ' + source $stdenv/setup + eval "$fakeRootCommands" + tar \ + --sort name \ + --exclude=./proc \ + --exclude=./sys \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + '' else '' + fakeroot bash -c ' + source $stdenv/setup + cd old_out + eval "$fakeRootCommands" + tar \ + --sort name \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + ''} sha256sum $out/layer.tar \ | cut -f 1 -d ' ' \ > $out/checksum |