diff options
author | Robert Hensing <roberth@users.noreply.github.com> | 2020-06-19 12:01:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-19 12:01:47 +0200 |
commit | 06469493de41e1cdb8bdd4b8f1e563d1e8dfd0aa (patch) | |
tree | ad6b086be043b90471008af8939360d36d66b7b9 /nixos | |
parent | 36429a4e59750271ffd2b90836646ac840c45641 (diff) | |
parent | 2dd94af18650aee1b53c9509832068b60c1b1225 (diff) |
Merge pull request #91085 from hercules-ci/fix-dockerTools-nix-symlinks
Fix docker tools nix symlinks
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/tests/docker-tools.nix | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 2375d15b38134..c48e5b0797628 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -42,6 +42,20 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker rmi ${examples.nix.imageName}", ) + with subtest("The nix binary symlinks are intact"): + docker.succeed( + "docker load --input='${examples.nix}'", + "docker run --rm ${examples.nix.imageName} ${pkgs.bash}/bin/bash -c 'test nix == $(readlink ${pkgs.nix}/bin/nix-daemon)'", + "docker rmi ${examples.nix.imageName}", + ) + + with subtest("The nix binary symlinks are intact when the image is layered"): + docker.succeed( + "docker load --input='${examples.nixLayered}'", + "docker run --rm ${examples.nixLayered.imageName} ${pkgs.bash}/bin/bash -c 'test nix == $(readlink ${pkgs.nix}/bin/nix-daemon)'", + "docker rmi ${examples.nixLayered.imageName}", + ) + with subtest("The pullImage tool works"): docker.succeed( "docker load --input='${examples.nixFromDockerHub}'", |