Unverified Commit 2bf7ff48 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #289840 from PigeonF/master 

Make `dockerTools.buildImageWithNixDb` reproducible
parents 575147ae 2cea1dce

pkgs/build-support/docker/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ let 
      # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478

      export USER=nobody

      ${buildPackages.nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration

      # Reset registration times to make the image reproducible

      ${buildPackages.sqlite}/bin/sqlite3 nix/var/nix/db/db.sqlite "UPDATE ValidPaths SET registrationTime = ''${SOURCE_DATE_EPOCH}"



      mkdir -p nix/var/nix/gcroots/docker/

      for i in ${lib.concatStringsSep " " contentsList}; do