summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorlewo <lewo@abesis.fr>2018-05-24 21:22:31 +0200
committerGitHub <noreply@github.com>2018-05-24 21:22:31 +0200
commit2e98e0c0032f4fb6630b76833309f108688f5955 (patch)
tree9d5b19c780cd75e8f990074c8333f10aab9e88b3 /nixos
parent2ce9d4f60cd1226eb3f57f08a102b8868e294918 (diff)
parent902b0593be857e4f19b9875638af6e854aa99a9b (diff)
downloadnixlib-2e98e0c0032f4fb6630b76833309f108688f5955.tar
nixlib-2e98e0c0032f4fb6630b76833309f108688f5955.tar.gz
nixlib-2e98e0c0032f4fb6630b76833309f108688f5955.tar.bz2
nixlib-2e98e0c0032f4fb6630b76833309f108688f5955.tar.lz
nixlib-2e98e0c0032f4fb6630b76833309f108688f5955.tar.xz
nixlib-2e98e0c0032f4fb6630b76833309f108688f5955.tar.zst
nixlib-2e98e0c0032f4fb6630b76833309f108688f5955.zip
Merge pull request #40947 from samueldr/fix/34779
dockerTools: fixes extraCommands for mkRootLayer.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/docker-tools.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 4466081d01e9..e2bcfbbd1f96 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -45,5 +45,11 @@ import ./make-test.nix ({ pkgs, ... }: {
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.onTopOfPulledImage}'");
       $docker->succeed("docker run --rm ontopofpulledimage hello");
       $docker->succeed("docker rmi ontopofpulledimage");
+
+      # Regression test for issue #34779
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.runAsRootExtraCommands}'");
+      $docker->succeed("docker run --rm runasrootextracommands cat extraCommands");
+      $docker->succeed("docker run --rm runasrootextracommands cat runAsRoot");
+      $docker->succeed("docker rmi '${pkgs.dockerTools.examples.runAsRootExtraCommands.imageName}'");
     '';
 })