dockerTools.buildImage: Fix incorrect layer unpack order before executing runAsRoot script #151150
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
When
dockerTools.buildImage
is provided both a multi-layerfromImage
and arunAsRoot
script, it incorrectly unpacks the layers specified in the parent image'smanifest.json
in reverse order before therunAsRoot
script is executed in a VM.This is particularly problematic when the
fromImage
and one of its ancestors' layers both contain the same path with different contents: the ancestor's "version" of that file incorrectly overwrites its descendants' in the VM where therunAsRoot
script executes (it should be the other way around).The image used for our existing layer ordering test doesn't catch this problem (the test image only uses
extraCommands
, and therefore can't test whether the layers get unpacked in the correct order in the VM when executing therunAsRoot
script). I've added an additional test that is able to detect this problem and confirms that this fix is able to address it.Things done
sandbox = true
set innix.conf
? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)nixos/doc/manual/md-to-db.sh
to update generated release notes