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

Merge pull request #13099 from datakurre/datakurre-dockertools

Browse Source 
dockerTools: Fix issue where image name with repository prefix was no…
This commit is contained in:
Luca Bruno 2016-02-18 17:30:54 +01:00
commit b7c57c831f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -267,7 +267,9 @@ EOF
let let
baseJson = writeText "${name}-config.json" (builtins.toJSON { baseName = baseNameOf name;
baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
created = "1970-01-01T00:00:01Z"; created = "1970-01-01T00:00:01Z";
architecture = "amd64"; architecture = "amd64";
os = "linux"; os = "linux";
@ -277,11 +279,11 @@ EOF
layer = (if runAsRoot == null layer = (if runAsRoot == null
then mkPureLayer { inherit baseJson contents extraCommands; } then mkPureLayer { inherit baseJson contents extraCommands; }
else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }); else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
depsTarball = mkTarball { name = "${name}-deps"; depsTarball = mkTarball { name = "${baseName}-deps";
drv = layer; drv = layer;
onlyDeps = true; }; onlyDeps = true; };
result = runCommand "${name}.tar.gz" { result = runCommand "${baseName}.tar.gz" {
buildInputs = [ jshon ]; buildInputs = [ jshon ];
imageName = name; imageName = name;