diff options
author | Ryan Lahfa <masterancpp@gmail.com> | 2024-03-27 09:29:53 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-27 09:29:53 -0700 |
commit | a199cd1dbd8a5e9bd9a525f0da7b6582264a6984 (patch) | |
tree | bd24d22c861b24a6761e40c80d622d027fc3c4cb /pkgs/build-support/docker | |
parent | 9b1984ce3648bf9479a67820876d72700c3faa4f (diff) | |
parent | bc40f51d1a50d6027d285fe2b673656930812be8 (diff) |
Merge pull request #297496 from abryko/docker-tag-discard-closure
dockerTools: discard closure reference in imageTag
Diffstat (limited to 'pkgs/build-support/docker')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6b8a03932f5b2..86bd7e312cbd3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -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 ]; } '' |