diff options
Diffstat (limited to 'nixpkgs/pkgs/build-support/docker/default.nix')
| -rw-r--r-- | nixpkgs/pkgs/build-support/docker/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nixpkgs/pkgs/build-support/docker/default.nix b/nixpkgs/pkgs/build-support/docker/default.nix index 7218d67062e7..05a1a6fbbdaf 100644 --- a/nixpkgs/pkgs/build-support/docker/default.nix +++ b/nixpkgs/pkgs/build-support/docker/default.nix @@ -805,6 +805,7 @@ rec { ''; # This provides /bin/sh, pointing to bashInteractive. + # The use of bashInteractive here is intentional to support cases like `docker run -it <image_name>`, so keep these use cases in mind if making any changes to how this works. binSh = runCommand "bin-sh" { } '' mkdir -p $out/bin ln -s ${bashInteractive}/bin/bash $out/bin/sh @@ -915,7 +916,7 @@ rec { mkdir $out ${if enableFakechroot then '' - proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c ' + proot -r $PWD/old_out ${bind-paths} --pwd=/ fakeroot bash -c ' source $stdenv/setup eval "$fakeRootCommands" tar \ |