Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 1e8b69c35e23760645e49f5055abe787b6743468
      
https://github.com/NixOS/nixpkgs/commit/1e8b69c35e23760645e49f5055abe787b6743468
  Author: Tom Boettcher <tbo...@gmail.com>
  Date:   2016-09-23 (Fri, 23 Sep 2016)

  Changed paths:
    M pkgs/build-support/docker/default.nix

  Log Message:
  -----------
  dockerTools: Fix layer redundancy.

When building an image with multiple layers, files
already included in an underlying layer are supposed to
be excluded from the current layer. However, some subtleties
in the way filepaths are compared seem to be blocking this.

Specifically:
* tar generates relative filepaths with directories ending in '/'
* find generates absolute filepaths with no trailing slashes on directories

That is, paths extracted from the underlying tarball look like:
    nix/store/.../foobar/
whereas the layer being generated uses paths like:
    /nix/store/.../foobar

This patch modifies the output of "tar -t" to match the latter format.


  Commit: c049fd4a31abc80c69e58cc40393b94eecba061b
      
https://github.com/NixOS/nixpkgs/commit/c049fd4a31abc80c69e58cc40393b94eecba061b
  Author: Luca Bruno <luca...@src.gnome.org>
  Date:   2016-09-25 (Sun, 25 Sep 2016)

  Changed paths:
    M pkgs/build-support/docker/default.nix

  Log Message:
  -----------
  Merge pull request #18896 from tboettch/dockerToolsFix

dockerTools: Fix layer redundancy.


Compare: https://github.com/NixOS/nixpkgs/compare/3d7d44a48e20...c049fd4a31ab
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to