From ca5fda39dc3875166c8cbbdd389b67d7e42052d1 Mon Sep 17 00:00:00 2001
From: Test <test@test.com>
Date: Mon, 31 Oct 2016 10:11:48 -0500
Subject: docker.buildUtils: use baseNameOf to allow for slashes in name

---
 pkgs/build-support/docker/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'pkgs/build-support')

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;
-- 
cgit 1.4.1