diff options
author | Asko Soukka <asko.soukka@iki.fi> | 2016-02-18 18:16:15 +0200 |
---|---|---|
committer | Asko Soukka <asko.soukka@iki.fi> | 2016-02-18 18:16:58 +0200 |
commit | 584427c69430268a0c2806805dc8f8392299a4e4 (patch) | |
tree | 09177265f56b49db9ac43c2d68502694a3426ef5 /pkgs/build-support/docker/default.nix | |
parent | 0884b63e53f0b69b625f34e244d550e99635a401 (diff) | |
download | nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.tar nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.tar.gz nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.tar.bz2 nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.tar.lz nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.tar.xz nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.tar.zst nixpkgs-584427c69430268a0c2806805dc8f8392299a4e4.zip |
dockerTools: Fix issue where image name with repository prefix was not supported
Diffstat (limited to 'pkgs/build-support/docker/default.nix')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 55344aad566..8e4a51071e3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -267,7 +267,9 @@ EOF let - baseJson = writeText "${name}-config.json" (builtins.toJSON { + baseName = baseNameOf name; + + baseJson = writeText "${baseName}-config.json" (builtins.toJSON { created = "1970-01-01T00:00:01Z"; architecture = "amd64"; os = "linux"; @@ -277,11 +279,11 @@ EOF layer = (if runAsRoot == null then mkPureLayer { inherit baseJson contents extraCommands; } else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }); - depsTarball = mkTarball { name = "${name}-deps"; + depsTarball = mkTarball { name = "${baseName}-deps"; drv = layer; onlyDeps = true; }; - result = runCommand "${name}.tar.gz" { + result = runCommand "${baseName}.tar.gz" { buildInputs = [ jshon ]; imageName = name; |