summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2020-10-05 10:48:17 +0200
committerRobert Hensing <robert@roberthensing.nl>2020-10-05 10:48:17 +0200
commit11b0106cf9ca3442870ba961e6c4adf6b44b6615 (patch)
tree26cff27c22cb53ef7d647695f590e210d6ef4d7f
parent0c98435f705ed3c17f34b4f0a1ce240838473140 (diff)
dockerTools: add isExe to streamLayeredImage result
-rw-r--r--pkgs/build-support/docker/default.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index b2c132afd741..35382662cf81 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -819,7 +819,13 @@ rec {
'';
result = runCommand "stream-${name}" {
inherit (conf) imageName;
- passthru = { inherit (conf) imageTag; };
+ passthru = {
+ inherit (conf) imageTag;
+
+ # Distinguish tarballs and exes at the Nix level so functions that
+ # take images can know in advance how the image is supposed to be used.
+ isExe = true;
+ };
buildInputs = [ makeWrapper ];
} ''
makeWrapper ${streamScript} $out --add-flags ${conf}