Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 27eca6455243
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: db75eb425716
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 16, 2020

  1. dockerTools.buildLayeredImage: store all paths passed in final layer 

    Fixes #78744

My previous change broke when there are more packages than the maximum
number of layers. I had assumed that the `store-path-to-layer.sh` was
only ever passed a single store path, but that is not the case if
there are multiple packages going into the final layer. To fix this, we
loop through the paths going into the final layer, appending them to the
tar file and making sure they end up at the right path.
    @roberth
    Richard Wallace authored and roberth committed Mar 16, 2020
    Copy the full SHA
    3781ac8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #82741 from hercules-ci/backport-20.03-80102 

    dockerTools.buildLayeredImage: store all paths passed in final layer (backport)
    @roberth
    roberth committed Mar 16, 2020
    Copy the full SHA
    db75eb4 View commit details
    Browse the repository at this point in the history