diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2021-06-01 14:42:21 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-02 15:02:31 +0000 |
| commit | fc30ee8ce7dcb00856356438ed427c4d32311c93 (patch) | |
| tree | 37be81f6e781faef687e194350f0272015733b2a | |
| parent | Merge pull request #125368 from NixOS/backport-125289-to-release-21.05 (diff) | |
| download | nixpkgs-fc30ee8ce7dcb00856356438ed427c4d32311c93.tar.gz | |
dockerTools: Fix passthru image tagorigin/backport-125216-to-release-21.05
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)
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 5bbf1b63f2b0..89510cd6330c 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -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 |