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: 40be1827ee6f
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 86f8732194f2
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 30, 2020

  1. dockerTools.buildLayeredImage: fix image with only 2 layers 

    A test is also added to ensure an image with 2 layers can be built.
    @nlewo
    nlewo committed Jan 30, 2020
    Copy the full SHA
    283bcc1 View commit details
    Browse the repository at this point in the history

  2. dockerTools.buildLayeredImage: assert maxLayers > 1 

    Since a layer is reserved for "customization", the image can not
contains less than 2 layers.

The user gets the following message at evaluation:

    nix-instantiate nixos/tests/docker-tools.nix
    trace: the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: 1)
    @nlewo
    nlewo committed Jan 30, 2020
    Copy the full SHA
    01a6847 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #78834 from nlewo/fix-two-layers-image 

    Fix dockerTools.buildLayerImage with 2 layers
    @nlewo
    nlewo committed Jan 30, 2020
    Copy the full SHA
    86f8732 View commit details
    Browse the repository at this point in the history