lol

Merge pull request #13099 from datakurre/datakurre-dockertools

dockerTools: Fix issue where image name with repository prefix was no…

+5 -3
+5 -3
pkgs/build-support/docker/default.nix
··· 267 267 268 268 let 269 269 270 - baseJson = writeText "${name}-config.json" (builtins.toJSON { 270 + baseName = baseNameOf name; 271 + 272 + baseJson = writeText "${baseName}-config.json" (builtins.toJSON { 271 273 created = "1970-01-01T00:00:01Z"; 272 274 architecture = "amd64"; 273 275 os = "linux"; ··· 277 279 layer = (if runAsRoot == null 278 280 then mkPureLayer { inherit baseJson contents extraCommands; } 279 281 else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }); 280 - depsTarball = mkTarball { name = "${name}-deps"; 282 + depsTarball = mkTarball { name = "${baseName}-deps"; 281 283 drv = layer; 282 284 onlyDeps = true; }; 283 285 284 - result = runCommand "${name}.tar.gz" { 286 + result = runCommand "${baseName}.tar.gz" { 285 287 buildInputs = [ jshon ]; 286 288 287 289 imageName = name;