about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRobert Hensing <roberth@users.noreply.github.com>2021-01-05 10:00:28 +0100
committerGitHub <noreply@github.com>2021-01-05 10:00:28 +0100
commit5540dd9b9ba6ebad454c2b3d0d31557b9521378e (patch)
tree09b8eef9b5f1a04e4f6b2deb3ea251285a30706c /nixos
parent517241f35480aa15999c92b5a669f229ea1b01d6 (diff)
parentffe5ff6009017ebbc384e38b5a26e37556d60ecc (diff)
Merge pull request #108416 from srhb/streamlayeredimage-symlinked-storepaths
dockerTools: Fix streamLayeredImage for symlinks
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/docker-tools.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix
index 8402ba68b7209..369ef94f9fadc 100644
--- a/nixos/tests/docker-tools.nix
+++ b/nixos/tests/docker-tools.nix
@@ -247,5 +247,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
             ).strip()
             == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}"
         )
+
+    with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"):
+        docker.succeed(
+            "docker load --input='${examples.layeredStoreSymlink}'",
+            "docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
+            "docker rmi ${examples.layeredStoreSymlink.imageName}",
+        )
   '';
 })