movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.docker-tools: Use unique binary in test case

Browse source
This commit is contained in:
Robert Hensing 2021-12-02 22:26:05 +00:00
parent 48cfdc8ca5
commit d0bcc212de
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/docker-tools.nix
View file

@ -388,7 +388,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
with subtest("The image contains store paths referenced by the fakeRootCommands output"): with subtest("The image contains store paths referenced by the fakeRootCommands output"):
docker.succeed( docker.succeed(
"docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} /hello/bin/hello" "docker run --rm ${examples.layeredImageWithFakeRootCommands.imageName} /hello/bin/layeredImageWithFakeRootCommands-hello"
) )
with subtest("exportImage produces a valid tarball"): with subtest("exportImage produces a valid tarball"):

6
pkgs/build-support/docker/examples.nix
View file

@ -507,7 +507,11 @@ rec {
fakeRootCommands = '' fakeRootCommands = ''
mkdir -p ./home/jane mkdir -p ./home/jane
chown 1000 ./home/jane chown 1000 ./home/jane
ln -s ${pkgs.pkgsStatic.hello} ./hello ln -s ${pkgs.hello.overrideAttrs (o: {
# A unique `hello` to make sure that it isn't included via another mechanism by accident.
configureFlags = o.configureFlags or "" + " --program-prefix=layeredImageWithFakeRootCommands-";
doCheck = false;
})} ./hello
''; '';
}; };