Merge pull request #99375 from hercules-ci/mark-streamLayeredImage

dockerTools: mark streamLayerdImage result as isExe
This commit is contained in:
Robert Hensing 2020-10-05 11:49:08 +02:00 committed by GitHub
commit 2d44a36532
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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}