public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26911 from manveru/patch-2 

dockerTools.buildImage: configurable timestamp
This commit is contained in:
Daiderd Jordan 2017-06-28 21:28:30 +02:00 committed by GitHub
parent ad82538423 54419f3016
commit 35b974a8e9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/build-support/docker/default.nix
View File

@ -380,6 +380,8 @@ rec {
runAsRoot ? null, runAsRoot ? null,
# Size of the virtual machine disk to provision when building the image. # Size of the virtual machine disk to provision when building the image.
diskSize ? 1024, diskSize ? 1024,
# Time of creation of the image.
created ? "1970-01-01T00:00:01Z",
}: }:
let let
@ -387,10 +389,9 @@ rec {
# Create a JSON blob of the configuration. Set the date to unix zero. # Create a JSON blob of the configuration. Set the date to unix zero.
baseJson = writeText "${baseName}-config.json" (builtins.toJSON { baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
created = "1970-01-01T00:00:01Z"; inherit created config;
architecture = "amd64"; architecture = "amd64";
os = "linux"; os = "linux";
config = config;
}); });
layer = layer =