summary refs log tree commit diff
path: root/nixos/tests/docker-tools.nix
diff options
context:
space:
mode:
authorUtku Demir <me@utdemir.com>2020-08-14 21:06:00 +1200
committerUtku Demir <me@utdemir.com>2020-09-04 16:53:23 +1200
commitae82f81bfaf8691e49a0de9c01c29c72a411bfb3 (patch)
tree2a9c93d4fc9ebd7518107f0fed45e7a701aaba0a /nixos/tests/docker-tools.nix
parent0ea35cf25cb42304dfadf9c6ceb590f1d9c3ad8c (diff)
downloadnixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.tar
nixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.tar.gz
nixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.tar.bz2
nixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.tar.lz
nixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.tar.xz
nixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.tar.zst
nixpkgs-ae82f81bfaf8691e49a0de9c01c29c72a411bfb3.zip
dockerTools.streamLayeredImage: Store the customisation layer as a tarball
This fixes as issue described here[1], where permissions set by 'extraCommands'
were ignored by Nix.

[1] https://github.com/NixOS/nixpkgs/pull/91084#issuecomment-669834938
Diffstat (limited to 'nixos/tests/docker-tools.nix')
-rw-r--r--nixos/tests/docker-tools.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 2543801ae8b..edb9aec62db 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -219,18 +219,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         )
 
     with subtest("Ensure correct behavior when no store is needed"):
-        # This check tests two requirements simultaneously
-        #  1. buildLayeredImage can build images that don't need a store.
-        #  2. Layers of symlinks are eliminated by the customization layer.
-        #
+        # This check tests that buildLayeredImage can build images that don't need a store.
         docker.succeed(
             "docker load --input='${pkgs.dockerTools.examples.no-store-paths}'"
         )
 
-        # Busybox will not recognize argv[0] and print an error message with argv[0],
-        # but it confirms that the custom-true symlink is present.
-        docker.succeed("docker run --rm no-store-paths custom-true |& grep custom-true")
-
         # This check may be loosened to allow an *empty* store rather than *no* store.
         docker.succeed("docker run --rm no-store-paths ls /")
         docker.fail("docker run --rm no-store-paths ls /nix/store")