diff options
| -rw-r--r-- | doc/builders/images/dockertools.section.md | 6 | ||||
| -rw-r--r-- | nixos/doc/manual/from_md/release-notes/rl-2205.section.xml | 8 | ||||
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2205.section.md | 4 | ||||
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/docker/examples.nix | 1 |
5 files changed, 6 insertions, 16 deletions
diff --git a/doc/builders/images/dockertools.section.md b/doc/builders/images/dockertools.section.md index af09f25222344..7ff4b2aeb3690 100644 --- a/doc/builders/images/dockertools.section.md +++ b/doc/builders/images/dockertools.section.md @@ -149,13 +149,13 @@ Create a Docker image with many of the store paths being on their own layer to i `fakeRootCommands` _optional_ -: Shell commands to run while creating the archive for the final layer in a fakeroot + fakechroot environment. Unlike `extraCommands`, you can run `chown` to change the owners of the files in the archive, changing fakeroot's state instead of the real filesystem. The latter would require privileges that the build user does not have. Static binaries do not interact with the fakeroot environment. By default all files in the archive will be owned by root. +: Shell commands to run while creating the archive for the final layer in a fakeroot environment. Unlike `extraCommands`, you can run `chown` to change the owners of the files in the archive, changing fakeroot's state instead of the real filesystem. The latter would require privileges that the build user does not have. Static binaries do not interact with the fakeroot environment. By default all files in the archive will be owned by root. `enableFakechroot` _optional_ -: Whether to run in `fakeRootCommands` in `fakechroot`, making programs behave as though `/` is the root of the image being created, while files in the Nix store are available as usual. This allows most scripts that perform installation in `/` to work as expected. Considering that `fakechroot` is implemented via the same mechanism as `fakeroot`, it is not guaranteed to work and will not work for static binaries. +: Whether to run in `fakeRootCommands` in `fakechroot`, making programs behave as though `/` is the root of the image being created, while files in the Nix store are available as usual. This allows scripts that perform installation in `/` to work as expected. Considering that `fakechroot` is implemented via the same mechanism as `fakeroot`, the same caveats apply. - *Default:* `true` when built on Linux, `false` otherwise + *Default:* `false` ### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents} diff --git a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml index 5e6a89dc981df..4752cad6c7b09 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2205.section.xml @@ -57,14 +57,6 @@ new versions will release. </para> </listitem> - <listitem> - <para> - <literal>pkgs.dockerTools.buildLayeredImage</literal>/<literal>streamLayeredImage</literal> - enable <literal>enableFakechroot</literal> by default on - Linux. This might be unexpected and can be set to - <literal>false</literal> if image generation fails. - </para> - </listitem> </itemizedlist> </section> <section xml:id="sec-release-22.05-notable-changes"> diff --git a/nixos/doc/manual/release-notes/rl-2205.section.md b/nixos/doc/manual/release-notes/rl-2205.section.md index b774b2af2f712..b0526a1fb3b49 100644 --- a/nixos/doc/manual/release-notes/rl-2205.section.md +++ b/nixos/doc/manual/release-notes/rl-2205.section.md @@ -27,8 +27,4 @@ In addition to numerous new and upgraded packages, this release has the followin org-contrib, refer to the ones in `pkgs.emacsPackages.elpaPackages` and `pkgs.emacsPackages.nongnuPackages` where the new versions will release. -* `pkgs.dockerTools.buildLayeredImage`/`streamLayeredImage` enable - `enableFakechroot` by default on Linux. - This might be unexpected and can be set to `false` if image generation fails. - ## Other Notable Changes {#sec-release-22.05-notable-changes} diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index a6d3109bf6d3a..9a20df57777cd 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -818,7 +818,8 @@ rec { fakeRootCommands ? "" , # Whether to run fakeRootCommands in fakechroot as well, so that they # appear to run inside the image, but have access to the normal Nix store. - enableFakechroot ? pkgs.stdenv.buildPlatform.isLinux + # Perhaps this could be enabled on by default on pkgs.stdenv.buildPlatform.isLinux + enableFakechroot ? false , # We pick 100 to ensure there is plenty of room for extension. I # believe the actual maximum is 128. maxLayers ? 100 diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 28b26be1f8a7f..f2d4f809ae4e3 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -566,6 +566,7 @@ rec { name = "image-via-fake-chroot"; tag = "latest"; config.Cmd = [ "hello" ]; + enableFakechroot = true; # Crucially, instead of a relative path, this creates /bin, which is # intercepted by fakechroot. # This functionality is not available on darwin as of 2021. |