summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorlewo <lewo@abesis.fr>2020-02-14 09:48:52 +0100
committerGitHub <noreply@github.com>2020-02-14 09:48:52 +0100
commitd49804cf456c01735c7d728c4acf88476a5be811 (patch)
treefb57fa402f1b1c64c8bbdb77f59fe86890e39805 /nixos
parentd7b8edf72399662b87d8ba95d85b54b54895a899 (diff)
parentbaa78de59403a69936bd9fc4709707d600926308 (diff)
downloadnixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.tar
nixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.tar.gz
nixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.tar.bz2
nixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.tar.lz
nixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.tar.xz
nixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.tar.zst
nixpkgs-d49804cf456c01735c7d728c4acf88476a5be811.zip
Merge pull request #80102 from nlewo/fix-78744
dockerTools.buildLayeredImage: store all paths passed in final layer (fix 78744)
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 07fac533680..ca750e8ba3c 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -83,5 +83,11 @@ import ./make-test.nix ({ pkgs, ... }: {
 
       # Ensure image with only 2 layers can be loaded
       $docker->succeed("docker load --input='${pkgs.dockerTools.examples.two-layered-image}'");
+
+      # Ensure the bulk layer didn't miss store paths
+      # Regression test for https://github.com/NixOS/nixpkgs/issues/78744
+      $docker->succeed("docker load --input='${pkgs.dockerTools.examples.bulk-layer}'");
+      # This ensure the two output paths (ls and hello) are in the layer
+      $docker->succeed("docker run bulk-layer ls /bin/hello");
     '';
 })