public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dockerTools: Fix passthru image tag

Browse Source 
It should match the actual image tag.
This fixes the problem introduced in 00996b5e03f33bebafc2b17c41a175d3726a9bde
https://github.com/NixOS/nixpkgs/pull/115491#pullrequestreview-672789901

(cherry picked from commit ff55c41facaa6812f9cc879a49f6929321881d4f)
This commit is contained in:
Robert Hensing 2021-06-01 14:42:21 +02:00 committed by github-actions[bot]
parent 5285a51c2e
commit fc30ee8ce7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/docker/default.nix
View File

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