Merge pull request #125388 from NixOS/backport-125216-to-release-21.05

[Backport release-21.05] dockerTools: Fix passthru image tag
This commit is contained in:
Robert Hensing 2021-06-02 17:19:19 +02:00 committed by GitHub
commit 68e821b051
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -536,7 +536,7 @@ rec {
passthru.layer = layer;
passthru.imageTag =
if tag != null
then lib.toLower tag
then tag
else
lib.head (lib.strings.splitString "-" (baseNameOf result.outPath));
# Docker can't be made to run darwin binaries