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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ecca42f0a2f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0000bf730b94
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 27, 2019

  1. Merge pull request #58431 from alexbiehl/alex/nix-layers 

    dockerTools: align generated layer archives with docker's output
(cherry picked from commit 6af3176)
    @grahamc @shlevy
    grahamc authored and shlevy committed Mar 27, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    afreakk Hans
    GPG key ID: 8B980523664C3A52
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0000bf7 View commit details
Showing with 2 additions and 1 deletion.
  1. +1 −1 pkgs/build-support/docker/default.nix
  2. +1 −0 pkgs/build-support/docker/store-path-to-layer.sh
2 changes: 1 addition & 1 deletion pkgs/build-support/docker/default.nix
View file
Original file line number Diff line number Diff line change
@@ -343,7 +343,7 @@ rec {
# Tar up the layer and throw it into 'layer.tar'.
echo "Packing layer..."
mkdir $out
tar -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
tar --transform='s|^\./||' -C layer --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
# Compute a checksum of the tarball.
echo "Computing layer checksum..."
1 change: 1 addition & 0 deletions pkgs/build-support/docker/store-path-to-layer.sh
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ layerPath="./layers/$layerNumber"
echo "Creating layer #$layerNumber for $@"

mkdir -p "$layerPath"
tar --no-recursion -rf "$layerPath/layer.tar" /nix /nix/store
tar -rpf "$layerPath/layer.tar" --hard-dereference --sort=name \
--mtime="@$SOURCE_DATE_EPOCH" \
--owner=0 --group=0 "$@"