public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dockerTools: Fix streamLayeredImage for symlinks

Browse Source 
When archiving `/nix/store/foo` and `foo` is itself a symlink, we must
not traverse the symlink target, but archive the `foo` symlink itself
This commit is contained in:
Sarah Brofeldt 2021-01-04 19:39:21 +01:00
parent 56bb1b0f7a
commit 08b0d02944
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/docker/stream_layered_image.py
View File

@ -83,7 +83,11 @@ def archive_paths_to(obj, paths, mtime):
for path in paths: for path in paths:
path = pathlib.Path(path) path = pathlib.Path(path)
if path.is_symlink():
files = [path]
else:
files = itertools.chain([path], path.rglob("*")) files = itertools.chain([path], path.rglob("*"))
for filename in sorted(files): for filename in sorted(files):
ti = append_root(tar.gettarinfo(filename)) ti = append_root(tar.gettarinfo(filename))