mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 04:19:00 +02:00
Merge pull request #297496 from abryko/docker-tag-discard-closure
dockerTools: discard closure reference in imageTag
This commit is contained in:
commit
a199cd1dbd
|
@ -637,7 +637,7 @@ rec {
|
||||||
if tag != null
|
if tag != null
|
||||||
then tag
|
then tag
|
||||||
else
|
else
|
||||||
lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
|
lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath)));
|
||||||
} ''
|
} ''
|
||||||
${lib.optionalString (tag == null) ''
|
${lib.optionalString (tag == null) ''
|
||||||
outName="$(basename "$out")"
|
outName="$(basename "$out")"
|
||||||
|
@ -1001,7 +1001,7 @@ rec {
|
||||||
if tag != null
|
if tag != null
|
||||||
then tag
|
then tag
|
||||||
else
|
else
|
||||||
lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
|
lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext conf.outPath)));
|
||||||
paths = buildPackages.referencesByPopularity overallClosure;
|
paths = buildPackages.referencesByPopularity overallClosure;
|
||||||
nativeBuildInputs = [ jq ];
|
nativeBuildInputs = [ jq ];
|
||||||
} ''
|
} ''
|
||||||
|
|
Loading…
Reference in a new issue