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: 48e8049c857c
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: b0f4499e9215
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 6, 2019

  1. dockerTools.buildLayeredImage: restore layer sharing 

    PR #58431 added /nix/store to each layer.tar. However, the timestamp was
not explicitly set while adding /nix and /nix/store to the archive. This
resulted in different SHA256 hashes of layer.tar between image builds.

This change sets time and owner when tar'ing /nix/store.
    @danieldk
    danieldk committed Jun 6, 2019
    Copy the full SHA
    d7f3186 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #62719 from danieldk/docker-fix-shared-layers 

    dockerTools.buildLayeredImage: restore layer sharing
    @nlewo
    nlewo committed Jun 6, 2019
    Copy the full SHA
    b0f4499 View commit details
    Browse the repository at this point in the history