From 11b0106cf9ca3442870ba961e6c4adf6b44b6615 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 5 Oct 2020 10:48:17 +0200 Subject: [PATCH] dockerTools: add isExe to streamLayeredImage result --- pkgs/build-support/docker/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index b2c132afd74..35382662cf8 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}