Navigation Menu

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: d7b8edf72399
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d49804cf456c
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Feb 14, 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.
    @nlewo
    Richard Wallace authored and nlewo committed Feb 14, 2020
    Copy the full SHA
    3b65b3f View commit details
    Browse the repository at this point in the history

  2. nixosTests.docker-tools: add bulk-layer test 

    A regression test for #78744.
    @nlewo
    nlewo committed Feb 14, 2020
    Copy the full SHA
    baa78de View commit details
    Browse the repository at this point in the history

  3. Merge pull request #80102 from nlewo/fix-78744 

    dockerTools.buildLayeredImage: store all paths passed in final layer (fix 78744)
    @nlewo
    nlewo committed Feb 14, 2020
    Copy the full SHA
    d49804c View commit details
    Browse the repository at this point in the history