diff options
author | Test <test@test.com> | 2016-10-31 10:11:48 -0500 |
---|---|---|
committer | Test <test@test.com> | 2016-10-31 10:11:48 -0500 |
commit | ca5fda39dc3875166c8cbbdd389b67d7e42052d1 (patch) | |
tree | b4262b4363439598cc5a95be46551c4fedb1b350 /pkgs/build-support | |
parent | a6e4e8f600e67af8dc7c03c14058d1c0a02ddc1a (diff) | |
download | nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.tar nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.tar.gz nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.tar.bz2 nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.tar.lz nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.tar.xz nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.tar.zst nixlib-ca5fda39dc3875166c8cbbdd389b67d7e42052d1.zip |
docker.buildUtils: use baseNameOf to allow for slashes in name
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b3db68a665dc..7fc4000cb300 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -395,10 +395,14 @@ rec { layer = if runAsRoot == null - then mkPureLayer { inherit name baseJson contents extraCommands; } - else mkRootLayer { inherit name baseJson fromImage fromImageName - fromImageTag contents runAsRoot diskSize - extraCommands; }; + then mkPureLayer { + name = baseName; + inherit baseJson contents extraCommands; + } else mkRootLayer { + name = baseName; + inherit baseJson fromImage fromImageName fromImageTag + contents runAsRoot diskSize extraCommands; + }; result = runCommand "docker-image-${baseName}.tar.gz" { buildInputs = [ jshon pigz coreutils findutils ]; imageName = name; |