Unverified Commit a199cd1d authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

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

dockerTools: discard closure reference in imageTag
parents 9b1984ce bc40f51d

pkgs/build-support/docker/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];

          } ''