diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2016-11-01 12:29:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 12:29:28 +0100 |
| commit | f84e2efcfd2896b39fc50236f64b0f0d5f78a22f (patch) | |
| tree | a18f26b2b70d702374779f779df7323d8264c47d /pkgs/build-support | |
| parent | 2dbaf3a33641039e948f6842b5939debd36f04bb (diff) | |
| parent | ca5fda39dc3875166c8cbbdd389b67d7e42052d1 (diff) | |
| download | nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.tar nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.tar.gz nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.tar.bz2 nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.tar.lz nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.tar.xz nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.tar.zst nixlib-f84e2efcfd2896b39fc50236f64b0f0d5f78a22f.zip | |
Merge pull request #20018 from adnelson/use_basename_docker
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 5f0a23853e4e..21e0d2b5128a 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; |