Merge pull request #297496 from abryko/docker-tag-discard-closure

dockerTools: discard closure reference in imageTag
This commit is contained in:
Ryan Lahfa 2024-03-27 09:29:53 -07:00 committed by GitHub
commit a199cd1dbd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -637,7 +637,7 @@ rec {
if tag != null
then tag
else
lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath)));
} ''
${lib.optionalString (tag == null) ''
outName="$(basename "$out")"
@ -1001,7 +1001,7 @@ rec {
if tag != null
then tag
else
lib.head (lib.strings.splitString "-" (baseNameOf conf.outPath));
lib.head (lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext conf.outPath)));
paths = buildPackages.referencesByPopularity overallClosure;
nativeBuildInputs = [ jq ];
} ''