Merge pull request #108416 from srhb/streamlayeredimage-symlinked-storepaths
dockerTools: Fix streamLayeredImage for symlinks
commit5540dd9b9ba6ebad454c2b3d0d31557b9521378e
authorRobert Hensing <roberth@users.noreply.github.com>
dateTue 5 Jan 2021, 10:00 (6 years ago)
parent517241fffe5ff6
nixos/tests/docker-tools.nix+7
@@ -247,5 +247,12 @@ import ./make-test-python.nix ({ pkgs, ... }: {
247247 ).strip()
248248 == "${if pkgs.system == "aarch64-linux" then "amd64" else "arm64"}"
249249 )
250+
251+ with subtest("buildLayeredImage doesn't dereference /nix/store symlink layers"):
252+ docker.succeed(
253+ "docker load --input='${examples.layeredStoreSymlink}'",
254+ "docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'",
255+ "docker rmi ${examples.layeredStoreSymlink.imageName}",
256+ )
250257 '';
251258})
pkgs/build-support/docker/examples.nix+11
@@ -416,4 +416,15 @@ rec {
416416 contents = crossPkgs.hello;
417417 };
418418
419+ # layered image where a store path is itself a symlink
420+ layeredStoreSymlink =
421+ let
422+ target = pkgs.writeTextDir "dir/target" "Content doesn't matter.";
423+ symlink = pkgs.runCommandNoCC "symlink" {} "ln -s ${target} $out";
424+ in
425+ pkgs.dockerTools.buildLayeredImage {
426+ name = "layeredstoresymlink";
427+ tag = "latest";
428+ contents = [ pkgs.bash symlink ];
429+ } // { passthru = { inherit symlink; }; };
419430}
pkgs/build-support/docker/stream_layered_image.py+5−1
@@ -83,7 +83,11 @@ def archive_paths_to(obj, paths, mtime):
8383
8484 for path in paths:
8585 path = pathlib.Path(path)
86− files = itertools.chain([path], path.rglob("*"))
86+ if path.is_symlink():
87+ files = [path]
88+ else:
89+ files = itertools.chain([path], path.rglob("*"))
90+
8791 for filename in sorted(files):
8892 ti = append_root(tar.gettarinfo(filename))
8993