Merge pull request #13099 from datakurre/datakurre-dockertools
dockerTools: Fix issue where image name with repository prefix was no…
This commit is contained in:
commit
b7c57c831f
|
@ -267,7 +267,9 @@ EOF
|
||||||
|
|
||||||
let
|
let
|
||||||
|
|
||||||
baseJson = writeText "${name}-config.json" (builtins.toJSON {
|
baseName = baseNameOf name;
|
||||||
|
|
||||||
|
baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
|
||||||
created = "1970-01-01T00:00:01Z";
|
created = "1970-01-01T00:00:01Z";
|
||||||
architecture = "amd64";
|
architecture = "amd64";
|
||||||
os = "linux";
|
os = "linux";
|
||||||
|
@ -277,11 +279,11 @@ EOF
|
||||||
layer = (if runAsRoot == null
|
layer = (if runAsRoot == null
|
||||||
then mkPureLayer { inherit baseJson contents extraCommands; }
|
then mkPureLayer { inherit baseJson contents extraCommands; }
|
||||||
else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
|
else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
|
||||||
depsTarball = mkTarball { name = "${name}-deps";
|
depsTarball = mkTarball { name = "${baseName}-deps";
|
||||||
drv = layer;
|
drv = layer;
|
||||||
onlyDeps = true; };
|
onlyDeps = true; };
|
||||||
|
|
||||||
result = runCommand "${name}.tar.gz" {
|
result = runCommand "${baseName}.tar.gz" {
|
||||||
buildInputs = [ jshon ];
|
buildInputs = [ jshon ];
|
||||||
|
|
||||||
imageName = name;
|
imageName = name;
|
||||||
|
|
Loading…
Reference in a new issue