diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-08 18:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-08 18:01:04 +0000 |
| commit | 13d222c591f2c2a74bcf19f046f76fa3531bf98a (patch) | |
| tree | 8af9fbba3ddc8441bf08c75adea81b1930138b06 /pkgs/build-support | |
| parent | ba83271df0ecfd8e9f149b632f370512ff946734 (diff) | |
| parent | a5d28c9bffb49868ca5688e5767d0782a995163b (diff) | |
| download | nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.gz nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.bz2 nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.lz nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.xz nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.tar.zst nixlib-13d222c591f2c2a74bcf19f046f76fa3531bf98a.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 23e439c6c423..05a1a6fbbdaf 100644 --- a/pkgs/build-support/docker/default.nix +++ b/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 |