ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 22:32:58 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #268458 from Mic92/dockertools

Browse Source 
nixos/dockerTools: fixup proot/fakeroot code (fixes dockertools nixos test)
This commit is contained in:
Robert Hensing 2023-11-19 21:50:16 +01:00 committed by GitHub
commit 2834c0cf2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/build-support/docker/default.nix
View File

@ -914,9 +914,22 @@ rec {
(cd old_out; eval "$extraCommands" )
mkdir $out
${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c '
${if enableFakechroot then ''
proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c '
source $stdenv/setup
${optionalString (!enableFakechroot) ''cd old_out''}
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 \
@ -924,7 +937,7 @@ rec {
--hard-dereference \
-cf $out/layer.tar .
'
''}
sha256sum $out/layer.tar \
| cut -f 1 -d ' ' \
> $out/checksum