diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-12-02 22:26:05 +0000 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-12-02 22:26:05 +0000 |
commit | d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6 (patch) | |
tree | 03b7bd0bccaf989922bb5601591d5b8ec23ead65 | |
parent | 48cfdc8ca57bbd88b3d16ddb0c83c2be6a643f8c (diff) | |
download | nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.tar nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.tar.gz nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.tar.bz2 nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.tar.lz nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.tar.xz nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.tar.zst nixpkgs-d0bcc212de13b1cd876bb8f01c90a8e8f42e25b6.zip |
nixosTests.docker-tools: Use unique binary in test case
-rw-r--r-- | nixos/tests/docker-tools.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/docker/examples.nix | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index d2c2ca286ff..31c5a5909c3 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -388,7 +388,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { with subtest("The image contains store paths referenced by the fakeRootCommands output"): 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"): diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index 0f7c3bd2820..3861c25caa4 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -507,7 +507,11 @@ rec { fakeRootCommands = '' mkdir -p ./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 ''; }; |