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

docker.buildUtils: use baseNameOf to allow for slashes in name

Browse Source
This commit is contained in:
Test 2016-10-31 10:11:48 -05:00
parent a6e4e8f600
commit ca5fda39dc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,10 +395,14 @@ rec {
layer = layer =
if runAsRoot == null if runAsRoot == null
then mkPureLayer { inherit name baseJson contents extraCommands; } then mkPureLayer {
else mkRootLayer { inherit name baseJson fromImage fromImageName name = baseName;
fromImageTag contents runAsRoot diskSize inherit baseJson contents extraCommands;
extraCommands; }; } else mkRootLayer {
name = baseName;
inherit baseJson fromImage fromImageName fromImageTag
contents runAsRoot diskSize extraCommands;
};
result = runCommand "docker-image-${baseName}.tar.gz" { result = runCommand "docker-image-${baseName}.tar.gz" {
buildInputs = [ jshon pigz coreutils findutils ]; buildInputs = [ jshon pigz coreutils findutils ];
imageName = name; imageName = name;